talons

commit 05e53c2a9d9ab784fe5bc197b450b91253758f3e
parent af7973c0b9526f84877594cf456a1b5c0ea3ebd8
Author: Paul <paul@claws-mail.org>
Date:   Wed, 18 May 2022 15:29:34 +0100

update en_GB.po

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

1 file changed, 3267 insertions(+), 3081 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license
 # as the Claws Mail package, see COPYING file.
 #
-# Paul Mangan <paul@claws-mail.org> 1999-2014
+# Paul Mangan <paul@claws-mail.org> 1999-2022
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 4.0.0\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2021-08-22 14:30+0100\n"
+"POT-Creation-Date: 2022-05-18 15:12+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"
@@ -40,204 +40,237 @@ msgid ""
 "indicates the default account."
 msgstr ""
 
-#: src/account.c:781 src/foldersel.c:349
+#: src/account.c:781 src/foldersel.c:348
 msgid "_New"
 msgstr ""
 
-#: src/account.c:787 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/account.c:787
+msgid "Create a new account"
+msgstr ""
+
+#: src/account.c:789 src/addressbook.c:401 src/addressbook.c:431
+#: src/addressbook.c:456 src/addressbook.c:473 src/compose.c:615
+#: src/mainwindow.c:518 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr ""
 
-#: src/account.c:793 src/addrcustomattr.c:492 src/addrduplicates.c:395
-#: src/editaddress.c:1323 src/editaddress.c:1550
-#: src/editaddress_other_attributes_ldap.c:431 src/edittags.c:576
-#: src/plugins/managesieve/sieve_manager.c:765 src/prefs_customheader.c:256
-#: src/prefs_filtering.c:472 src/prefs_template.c:316 src/prefs_toolbar.c:1009
-#: src/ssl_manager.c:211
+#: src/account.c:795
+msgid "Edit preferences for the selected account"
+msgstr ""
+
+#: src/account.c:797 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/addrcustomattr.c:495 src/addrduplicates.c:395 src/addrduplicates.c:793
+#: src/addressbook.c:1478 src/addressbook.c:1486 src/addressbook.c:2954
+#: src/addressbook.c:2982 src/addressbook.c:2989 src/editaddress.c:1325
+#: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:431
+#: src/edittags.c:234 src/edittags.c:270 src/edittags.c:586 src/mh_gtk.c:207
+#: src/plugins/managesieve/sieve_manager.c:766 src/prefs_actions.c:724
+#: src/prefs_actions.c:746 src/prefs_customheader.c:256
+#: src/prefs_filtering.c:472 src/prefs_filtering.c:1196
+#: src/prefs_filtering.c:1216 src/prefs_template.c:316 src/prefs_template.c:899
+#: src/prefs_template.c:912 src/prefs_toolbar.c:1010 src/ssl_manager.c:211
+#: src/ssl_manager.c:453
 msgid "D_elete"
 msgstr ""
 
-#: src/account.c:799 src/addressbook.c:433 src/addressbook.c:469
-#: src/addressbook.c:485 src/compose.c:639 src/mainwindow.c:551
-#: src/messageview.c:228 src/plugins/managesieve/sieve_editor.c:96
+#: src/account.c:803
+msgid "Delete the selected account from the list"
+msgstr ""
+
+#: src/account.c:805 src/addressbook.c:428 src/addressbook.c:464
+#: src/addressbook.c:480 src/compose.c:644 src/mainwindow.c:552
+#: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr ""
 
-#: src/account.c:805 src/editaddress.c:1322 src/gtk/foldersort.c:315
-#: src/prefs_actions.c:402 src/prefs_customheader.c:289
+#: src/account.c:811
+msgid "Create a new copy of the selected account"
+msgstr ""
+
+#: src/account.c:813 src/editaddress.c:1324 src/gtk/foldersort.c:318
+#: src/prefs_actions.c:401 src/prefs_customheader.c:289
 #: src/prefs_display_header.c:391 src/prefs_filtering_action.c:620
 #: src/prefs_filtering.c:538 src/prefs_folder_column.c:316
 #: src/prefs_matcher.c:831 src/prefs_summary_column.c:330
 #: src/prefs_summary_open.c:295 src/prefs_template.c:374
-#: src/prefs_toolbar.c:1057
+#: src/prefs_toolbar.c:1058
 msgid "_Down"
 msgstr ""
 
-#: src/account.c:811 src/editaddress.c:1321 src/gtk/foldersort.c:311
-#: src/prefs_actions.c:394 src/prefs_customheader.c:283
+#: src/account.c:819
+msgid "Move the selected account down"
+msgstr ""
+
+#: src/account.c:821 src/editaddress.c:1323 src/gtk/foldersort.c:312
+#: src/prefs_actions.c:393 src/prefs_customheader.c:283
 #: src/prefs_display_header.c:385 src/prefs_filtering_action.c:615
 #: src/prefs_filtering.c:530 src/prefs_folder_column.c:312
 #: src/prefs_matcher.c:826 src/prefs_summary_column.c:326
 #: src/prefs_summary_open.c:289 src/prefs_template.c:366
-#: src/prefs_toolbar.c:1053
+#: src/prefs_toolbar.c:1054
 msgid "_Up"
 msgstr ""
 
-#: src/account.c:822
+#: src/account.c:827
+msgid "Move the selected account up"
+msgstr ""
+
+#: src/account.c:834
 msgid " _Set as default account "
 msgstr ""
 
-#: src/account.c:829 src/action.c:1405 src/addrduplicates.c:399
-#: 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/icon_legend.c:184
-#: src/gtk/pluginwindow.c:391 src/gtk/prefswindow.c:510
-#: 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:914
-#: src/prefs_actions.c:919 src/prefs_actions.c:945 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
+#: src/account.c:841 src/action.c:1408 src/addrduplicates.c:399
+#: src/addrduplicates.c:843 src/addressadd.c:600 src/addressbook.c:422
+#: src/addressbook.c:1432 src/addressbook.c:3257 src/addressbook.c:3309
+#: src/addressbook.c:4178 src/addressbook.c:4183 src/addressbook.c:4299
+#: src/addrindex.c:1836 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:636 src/edittags.c:591
+#: src/exphtmldlg.c:193 src/exphtmldlg.c:295 src/expldifdlg.c:323
+#: src/gtk/about.c:917 src/gtk/icon_legend.c:184 src/gtk/pluginwindow.c:391
+#: src/gtk/prefswindow.c:512 src/gtk/sslcertwindow.c:374 src/importldif.c:438
+#: src/inc.c:841 src/message_search.c:238 src/message_search.c:320
+#: src/messageview.c:226 src/plugins/managesieve/sieve_editor.c:88
+#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/managesieve/sieve_manager.c:786
+#: src/plugins/pdf_viewer/poppler_viewer.c:1233
+#: src/plugins/pgpcore/sgpgme.c:1004 src/prefs_actions.c:915
+#: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1315
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597 src/prefs_themes.c:718
+#: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr ""
 
-#: src/account.c:914
+#: src/account.c:926
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
-#: src/account.c:921
+#: src/account.c:933
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: src/account.c:1125
+#: src/account.c:1137
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
-#: src/account.c:1127
+#: src/account.c:1139
 msgid "(Untitled)"
 msgstr ""
 
-#: src/account.c:1128
+#: src/account.c:1140
 msgid "Delete account"
 msgstr ""
 
-#: 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:9520 src/compose.c:10698
-#: src/compose.c:10703 src/compose.c:10777 src/compose.c:11669
-#: src/compose.c:12187 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:2490 src/folderview.c:2548 src/grouplistdialog.c:241
-#: src/gtk/foldersort.c:243 src/gtk/gtkaspell.c:1513 src/gtk/inputdialog.c:368
-#: src/gtk/prefswindow.c:505 src/gtk/progressdialog.c:97 src/imap.c:1183
-#: 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:2297
-#: src/mainwindow.c:4009 src/mainwindow.c:4211 src/mbox.c:552
-#: src/messageview.c:2068 src/messageview.c:2079 src/mh_gtk.c:207
-#: src/mh_gtk.c:375 src/mimeview.c:1910 src/mimeview.c:1935 src/mimeview.c:2360
-#: src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:214
-#: src/plugins/archive/archiver_gtk.c:117
+#: src/account.c:1141 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/addrcustomattr.c:498 src/addrduplicates.c:147 src/addrduplicates.c:793
+#: src/addressadd.c:300 src/addressbook.c:1478 src/addressbook.c:1486
+#: src/addressbook.c:2954 src/addressbook.c:2967 src/addressbook.c:2981
+#: src/addressbook.c:2988 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3701 src/compose.c:3829 src/compose.c:5140 src/compose.c:5177
+#: src/compose.c:5214 src/compose.c:5257 src/compose.c:5821 src/compose.c:5880
+#: src/compose.c:6116 src/compose.c:9554 src/compose.c:10752
+#: src/compose.c:10757 src/compose.c:10831 src/compose.c:11731
+#: src/compose.c:12248 src/editaddress.c:172 src/editaddress.c:815
+#: src/editbook.c:196 src/editgroup.c:405 src/editjpilot.c:305
+#: src/editldap_basedn.c:238 src/editldap.c:362 src/edittags.c:234
+#: src/edittags.c:270 src/editvcard.c:203 src/exphtmldlg.c:608
+#: src/exphtmldlg.c:683 src/expldifdlg.c:673 src/expldifdlg.c:749
+#: src/export.c:174 src/foldersel.c:349 src/folderview.c:2497
+#: src/folderview.c:2555 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/gtk/gtkaspell.c:1511 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
+#: src/gtk/progressdialog.c:95 src/imap.c:1183 src/imap_gtk.c:369
+#: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:173 src/import.c:208
+#: src/importldif.c:925 src/importldif.c:991 src/importmutt.c:250
+#: src/importpine.c:249 src/inc.c:890 src/main.c:2286 src/mainwindow.c:4009
+#: src/mainwindow.c:4212 src/mbox.c:549 src/messageview.c:2080
+#: src/messageview.c:2091 src/mh_gtk.c:207 src/mh_gtk.c:376 src/mimeview.c:1818
+#: src/mimeview.c:1843 src/mimeview.c:2268 src/news.c:409 src/news_gtk.c:252
+#: src/password_gtk.c:211 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/archive/archiver_gtk.c:944
+#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/att_remover/att_remover.c:387
+#: src/plugins/att_remover/att_remover.c:429
+#: src/plugins/attachwarner/attachwarner.c:218
 #: 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/keyword_warner/keyword_warner.c:196
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:336
 #: 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_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/notification/notification_foldercheck.c:590
+#: src/plugins/notification/notification_foldercheck.c:588
 #: 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/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:194
+#: src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/plugins/rssyl/rssyl_feed_props.c:481
 #: 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:2003
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:220
-#: src/prefs_actions.c:725 src/prefs_actions.c:746 src/prefs_customheader.c:177
+#: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:219
+#: src/prefs_actions.c:724 src/prefs_actions.c:746 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:1751
-#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:287
+#: src/prefs_filtering.c:1196 src/prefs_filtering.c:1216
+#: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1827
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:284
 #: 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:1328 src/summaryview.c:4555 src/summaryview.c:5017
-#: src/summaryview.c:5071 src/summaryview.c:5810 src/textview.c:2910
-#: src/toolbar.c:3055 src/wizard.c:1813
+#: src/prefs_themes.c:600 src/send_message.c:294 src/ssl_manager.c:453
+#: src/summaryview.c:1331 src/summaryview.c:4560 src/summaryview.c:5029
+#: src/summaryview.c:5085 src/summaryview.c:5824 src/textview.c:3113
+#: src/toolbar.c:3108 src/wizard.c:1833
 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/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:432
+#: src/addressbook.c:457 src/addressbook.c:474 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1310
+#: src/plugins/att_remover/att_remover.c:429
+#: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/vcalendar/vcal_folder.c:2003 src/prefs_actions.c:1104
+#: src/plugins/rssyl/rssyl_cb_menu.c:194
+#: src/plugins/vcalendar/vcal_folder.c:2032 src/prefs_actions.c:1105
 #: src/prefs_customheader.c:693 src/prefs_display_header.c:328
-#: src/prefs_filtering.c:1681 src/prefs_template.c:1105 src/summaryview.c:4555
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1105 src/summaryview.c:4560
 msgid "_Delete"
 msgstr ""
 
-#: src/account.c:1602
+#: src/account.c:1615
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1608
+#: src/account.c:1621
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: 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/account.c:1628 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:128 src/compose.c:7500 src/editaddress.c:1478
+#: src/editaddress.c:1500 src/editaddress.c:1519
 #: 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/editgroup.c:286 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: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:997
+#: src/plugins/pdf_viewer/poppler_viewer.c:1860
+#: src/plugins/pgpcore/select-keys.c:468 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1862 src/prefs_summaries.c:479 src/prefs_template.c:78
+#: src/prefs_themes.c:1092
 msgid "Name"
 msgstr ""
 
-#: src/account.c:1623 src/prefs_account.c:1267 src/prefs_account.c:4956
+#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1631 src/ssl_manager.c:109
+#: src/account.c:1644 src/ssl_manager.c:109
 msgid "Server"
 msgstr ""
 
@@ -273,7 +306,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/action.c:997
+#: src/action.c:1000
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -281,40 +314,44 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/action.c:999 src/compose.c:5265 src/compose.c:5270 src/compose.c:9673
-#: src/compose.c:9712 src/ldaputil.c:333
+#: src/action.c:1002 src/compose.c:5290 src/compose.c:5295 src/compose.c:9712
+#: src/compose.c:9755 src/ldaputil.c:334
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: src/plugins/vcalendar/vcal_folder.c:1833
-#: src/plugins/vcalendar/vcal_folder.c:1837
-#: src/plugins/vcalendar/vcal_folder.c:1855
-#: src/plugins/vcalendar/vcal_folder.c:1858 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1825
+#: src/plugins/vcalendar/vcal_folder.c:1829
+#: src/plugins/vcalendar/vcal_folder.c:1847
+#: src/plugins/vcalendar/vcal_folder.c:1850 src/privacy.c:64
 msgid "Unknown error"
 msgstr ""
 
-#: src/action.c:1218 src/action.c:1395
+#: src/action.c:1223 src/action.c:1397
 msgid "Completed"
 msgstr ""
 
-#: src/action.c:1255
+#: src/action.c:1260
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1259
+#: src/action.c:1264
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1305
+#: src/action.c:1307
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1369
+#: src/action.c:1371
 msgid "_Execute"
 msgstr ""
 
-#: src/action.c:1641
+#: src/action.c:1406
+msgid "_Stop"
+msgstr ""
+
+#: src/action.c:1648
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -322,11 +359,11 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1646
+#: src/action.c:1653
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1650
+#: src/action.c:1657
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -334,23 +371,23 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1655
+#: src/action.c:1662
 msgid "Action's user argument"
 msgstr ""
 
-#: src/addrclip.c:481
+#: src/addrclip.c:483
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addrclip.c:504
+#: src/addrclip.c:506
 msgid "Cannot copy an address book to itself."
 msgstr ""
 
-#: src/addrclip.c:595
+#: src/addrclip.c:597
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addr_compl.c:699 src/addressbook.c:5006
+#: src/addr_compl.c:699 src/addressbook.c:5008
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr ""
@@ -403,126 +440,126 @@ msgstr ""
 msgid "Do you really want to delete all attribute names?"
 msgstr ""
 
-#: src/addrcustomattr.c:185
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr ""
 
-#: src/addrcustomattr.c:186
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr ""
 
-#: src/addrcustomattr.c:195
+#: src/addrcustomattr.c:197
 msgid "Reset to default"
 msgstr ""
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:198
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
 
-#: src/addrcustomattr.c:197 src/compose.c:9787 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9838 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:883 src/folderview.c:1105
-#: src/folderview.c:2536 src/folderview.c:2638 src/inc.c:1668 src/main.c:407
-#: src/mainwindow.c:2877 src/mainwindow.c:2882 src/message_search.c:335
+#: src/file_checker.c:107 src/folderview.c:884 src/folderview.c:1112
+#: src/folderview.c:2543 src/folderview.c:2651 src/inc.c:1673 src/main.c:412
+#: src/mainwindow.c:2872 src/mainwindow.c:2877 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:1328 src/summaryview.c:1941
-#: src/summaryview.c:1989 src/summaryview.c:2026 src/summaryview.c:2074
-#: src/summaryview.c:2108 src/summaryview.c:2141 src/summaryview.c:2175
-#: src/summaryview.c:2204 src/summaryview.c:4269 src/summaryview.c:4315
-#: src/summaryview.c:6077 src/toolbar.c:3035
+#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:712
+#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
+#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
+#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
+#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
+#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
+#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
+#: src/summaryview.c:6091 src/toolbar.c:3088
 msgid "_No"
 msgstr ""
 
-#: src/addrcustomattr.c:197 src/compose.c:9787 src/compose.c:12187
+#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12248
 #: 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:883
-#: src/folderview.c:1105 src/folderview.c:2536 src/folderview.c:2638
-#: src/inc.c:1668 src/main.c:407 src/mainwindow.c:2877 src/mainwindow.c:2882
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:884
+#: src/folderview.c:1112 src/folderview.c:2543 src/folderview.c:2651
+#: src/inc.c:1673 src/main.c:412 src/mainwindow.c:2872 src/mainwindow.c:2877
 #: 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:1328 src/summaryview.c:1941
-#: src/summaryview.c:1989 src/summaryview.c:2026 src/summaryview.c:2074
-#: src/summaryview.c:2108 src/summaryview.c:2141 src/summaryview.c:2175
-#: src/summaryview.c:2204 src/summaryview.c:4269 src/summaryview.c:4315
-#: src/summaryview.c:5071 src/summaryview.c:6077 src/toolbar.c:3035
+#: src/plugins/pgpcore/select-keys.c:712 src/plugins/pgpcore/sgpgme.c:1088
+#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/plugins/vcalendar/vcalendar.c:962 src/prefs_migration.c:61
+#: src/prefs_themes.c:512 src/prefs_themes.c:568 src/prefs_themes.c:577
+#: src/summary_search.c:797 src/summaryview.c:1331 src/summaryview.c:1938
+#: src/summaryview.c:1987 src/summaryview.c:2025 src/summaryview.c:2074
+#: src/summaryview.c:2109 src/summaryview.c:2143 src/summaryview.c:2178
+#: src/summaryview.c:2208 src/summaryview.c:4274 src/summaryview.c:4320
+#: src/summaryview.c:5085 src/summaryview.c:6091 src/toolbar.c:3088
 msgid "_Yes"
 msgstr ""
 
-#: src/addrcustomattr.c:217 src/edittags.c:286 src/prefs_actions.c:1105
-#: src/prefs_filtering.c:1682 src/prefs_template.c:1106
+#: src/addrcustomattr.c:219 src/edittags.c:298 src/prefs_actions.c:1106
+#: src/prefs_filtering.c:1690 src/prefs_template.c:1106
 msgid "Delete _all"
 msgstr ""
 
-#: src/addrcustomattr.c:218
+#: src/addrcustomattr.c:220
 msgid "_Reset to default"
 msgstr ""
 
-#: src/addrcustomattr.c:407
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr ""
 
-#: src/addrcustomattr.c:466
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr ""
 
-#: src/addrcustomattr.c:480
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr ""
 
-#: src/addrcustomattr.c:489 src/editaddress.c:1325 src/editaddress.c:1556
-#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:376
-#: src/edittags.c:573 src/prefs_actions.c:321 src/prefs_customheader.c:249
+#: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
+#: src/editaddress_other_attributes_ldap.c:437 src/editgroup.c:344
+#: src/edittags.c:581 src/prefs_actions.c:320 src/prefs_customheader.c:249
 #: src/prefs_display_header.c:321 src/prefs_display_header.c:372
 #: src/prefs_filtering_action.c:580 src/prefs_filtering.c:455
 #: src/prefs_folder_column.c:271 src/prefs_matcher.c:791
 #: src/prefs_summary_column.c:285 src/prefs_summary_open.c:241
-#: src/prefs_template.c:299 src/prefs_toolbar.c:997
+#: src/prefs_template.c:299 src/prefs_toolbar.c:998
 msgid "_Add"
 msgstr ""
 
-#: src/addrcustomattr.c:496 src/addressadd.c:301
-#: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:370
-#: src/compose.c:5859 src/compose.c:9521 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:506 src/import.c:174
-#: src/import.c:204 src/importmutt.c:251 src/importpine.c:250 src/main.c:2297
-#: src/mimeview.c:1911 src/password_gtk.c:215
+#: src/addrcustomattr.c:499 src/addressadd.c:301
+#: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:385
+#: src/compose.c:5880 src/compose.c:9555 src/editaddress.c:172
+#: src/editaddress.c:816 src/editbook.c:197 src/editgroup.c:406
+#: src/editjpilot.c:306 src/editldap_basedn.c:239 src/editldap.c:363
+#: src/editvcard.c:204 src/export.c:175 src/foldersel.c:350
+#: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1513
+#: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:174
+#: src/import.c:208 src/importmutt.c:251 src/importpine.c:250 src/main.c:2286
+#: src/mimeview.c:1819 src/password_gtk.c:213
 #: 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/archive/archiver_gtk.c:1045
+#: src/plugins/att_remover/att_remover.c:388
 #: src/plugins/gdata/cm_gdata_contacts.c:137
-#: src/plugins/managesieve/sieve_editor.c:632
-#: src/plugins/notification/notification_foldercheck.c:591
+#: src/plugins/managesieve/sieve_editor.c:633
+#: src/plugins/notification/notification_foldercheck.c:589
 #: 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_feed_props.c:487
 #: 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:221
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1793
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1917 src/prefs_actions.c:220
 #: 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_summaries.c:285 src/prefs_summary_column.c:356
 #: src/prefs_summary_open.c:182 src/prefs_template.c:400
 msgid "_OK"
 msgstr ""
 
-#: src/addrcustomattr.c:517
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -545,6 +582,11 @@ msgid ""
 "Claws Mail will now search for duplicate email addresses in the address book."
 msgstr ""
 
+#: src/addrduplicates.c:147 src/addressbook.c:1160 src/compose.c:671
+#: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
+msgid "_Find"
+msgstr ""
+
 #: src/addrduplicates.c:315
 msgid "No duplicate email addresses found in the address book"
 msgstr ""
@@ -554,8 +596,8 @@ msgid "Duplicate email addresses"
 msgstr ""
 
 #: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
-#: src/toolbar.c:529
+#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
+#: src/toolbar.c:540
 msgid "Address"
 msgstr ""
 
@@ -563,11 +605,11 @@ msgstr ""
 msgid "Address book path"
 msgstr ""
 
-#: src/addrduplicates.c:791 src/addressbook.c:1435 src/addressbook.c:1488
+#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
 msgid "Delete address(es)"
 msgstr ""
 
-#: src/addrduplicates.c:792 src/addressbook.c:1489
+#: src/addrduplicates.c:792 src/addressbook.c:1485
 msgid "Really delete the address(es)?"
 msgstr ""
 
@@ -575,7 +617,7 @@ msgstr ""
 msgid "Delete address"
 msgstr ""
 
-#: src/addrduplicates.c:842 src/addressbook.c:1436
+#: src/addrduplicates.c:842 src/addressbook.c:1431
 msgid "This address data is read-only and cannot be deleted."
 msgstr ""
 
@@ -587,8 +629,8 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1256
-#: src/editaddress.c:1301 src/editgroup.c:290
+#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr ""
 
@@ -596,407 +638,402 @@ msgstr ""
 msgid "Select Address Book Folder"
 msgstr ""
 
-#: src/addressadd.c:599 src/addressbook.c:3256 src/addressbook.c:3307
+#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
 msgid "Add address(es)"
 msgstr ""
 
-#: src/addressadd.c:600
+#: src/addressadd.c:599
 msgid "Can't add the specified address"
 msgstr ""
 
-#: 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
+#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/editaddress.c:1284 src/editgroup.c:287 src/expldifdlg.c:509
+#: src/exporthtml.c:597 src/exporthtml.c:761 src/ldif.c:767
 msgid "Email Address"
 msgstr ""
 
-#: src/addressbook.c:405
+#: src/addressbook.c:400
 msgid "_Book"
 msgstr ""
 
-#: src/addressbook.c:407 src/compose.c:615 src/mainwindow.c:520
-#: src/messageview.c:215
+#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/messageview.c:216
 msgid "_Tools"
 msgstr ""
 
-#: src/addressbook.c:410 src/addressbook.c:464
+#: src/addressbook.c:405 src/addressbook.c:459
 msgid "New _Book"
 msgstr ""
 
-#: src/addressbook.c:411 src/addressbook.c:465
+#: src/addressbook.c:406 src/addressbook.c:460
 msgid "New _Folder"
 msgstr ""
 
-#: src/addressbook.c:412
+#: src/addressbook.c:407
 msgid "New _vCard"
 msgstr ""
 
-#: src/addressbook.c:416
+#: src/addressbook.c:411
 msgid "New _JPilot"
 msgstr ""
 
-#: src/addressbook.c:419
+#: src/addressbook.c:414
 msgid "New LDAP _Server"
 msgstr ""
 
-#: src/addressbook.c:423
+#: src/addressbook.c:418
 msgid "_Edit book"
 msgstr ""
 
-#: src/addressbook.c:424
+#: src/addressbook.c:419
 msgid "_Delete book"
 msgstr ""
 
-#: src/addressbook.c:426 src/compose.c:627 src/editaddress.c:1324
-#: src/editaddress.c:1553 src/editaddress_other_attributes_ldap.c:434
+#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/editaddress.c:1556 src/editaddress_other_attributes_ldap.c:434
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:434
-#: src/plugins/managesieve/sieve_editor.c:633 src/wizard.c:1812
+#: src/plugins/managesieve/sieve_editor.c:435
+#: src/plugins/managesieve/sieve_editor.c:634 src/wizard.c:1832
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
+#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
 msgid "_Select all"
 msgstr ""
 
-#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
+#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
 msgid "C_ut"
 msgstr ""
 
-#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
-#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr ""
 
-#: src/addressbook.c:439 src/addressbook.c:481
+#: src/addressbook.c:434 src/addressbook.c:476
 msgid "New _Address"
 msgstr ""
 
-#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
+#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
 msgid "New _Group"
 msgstr ""
 
-#: src/addressbook.c:442 src/addressbook.c:488
+#: src/addressbook.c:437 src/addressbook.c:483
 msgid "_Mail To"
 msgstr ""
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:438 src/addressbook.c:487
 msgid "_Merge"
 msgstr ""
 
-#: src/addressbook.c:447
+#: src/addressbook.c:442
 msgid "Import _LDIF file..."
 msgstr ""
 
-#: src/addressbook.c:448
+#: src/addressbook.c:443
 msgid "Import M_utt file..."
 msgstr ""
 
-#: src/addressbook.c:449
+#: src/addressbook.c:444
 msgid "Import _Pine file..."
 msgstr ""
 
-#: src/addressbook.c:451
+#: src/addressbook.c:446
 msgid "Export _HTML..."
 msgstr ""
 
-#: src/addressbook.c:452
+#: src/addressbook.c:447
 msgid "Export LDI_F..."
 msgstr ""
 
-#: src/addressbook.c:454
+#: src/addressbook.c:449
 msgid "Find duplicates..."
 msgstr ""
 
-#: src/addressbook.c:455
+#: src/addressbook.c:450
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:490
+#: src/addressbook.c:485
 msgid "_Browse Entry"
 msgstr ""
 
-#: 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:397
-#: src/plugins/vcalendar/month-view.c:424 src/prefs_themes.c:823
-#: src/prefs_themes.c:855 src/prefs_themes.c:856
+#: src/addressbook.c:499 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:251 src/plugins/pgpcore/sgpgme.c:330
+#: src/plugins/pgpcore/sgpgme.c:358 src/plugins/vcalendar/day-view.c:405
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:917
+#: src/prefs_themes.c:949 src/prefs_themes.c:950
 msgid "Unknown"
 msgstr ""
 
-#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
+#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
 msgid "Success"
 msgstr ""
 
-#: src/addressbook.c:512 src/importldif.c:122
+#: src/addressbook.c:507 src/importldif.c:122
 msgid "Bad arguments"
 msgstr ""
 
-#: src/addressbook.c:513 src/importldif.c:123
+#: src/addressbook.c:508 src/importldif.c:123
 msgid "File not specified"
 msgstr ""
 
-#: src/addressbook.c:514 src/importldif.c:124
+#: src/addressbook.c:509 src/importldif.c:124
 msgid "Error opening file"
 msgstr ""
 
-#: src/addressbook.c:515 src/importldif.c:125
+#: src/addressbook.c:510 src/importldif.c:125
 msgid "Error reading file"
 msgstr ""
 
-#: src/addressbook.c:516 src/importldif.c:126
+#: src/addressbook.c:511 src/importldif.c:126
 msgid "End of file encountered"
 msgstr ""
 
-#: src/addressbook.c:517 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr ""
 
-#: src/addressbook.c:518 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128
 msgid "Bad file format"
 msgstr ""
 
-#: src/addressbook.c:519 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129
 msgid "Error writing to file"
 msgstr ""
 
-#: src/addressbook.c:520 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130
 msgid "Error opening directory"
 msgstr ""
 
-#: src/addressbook.c:521 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131
 msgid "No path specified"
 msgstr ""
 
-#: src/addressbook.c:531
+#: src/addressbook.c:526
 msgid "Error connecting to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:532
+#: src/addressbook.c:527
 msgid "Error initializing LDAP"
 msgstr ""
 
-#: src/addressbook.c:533
+#: src/addressbook.c:528
 msgid "Error binding to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:534
+#: src/addressbook.c:529
 msgid "Error searching LDAP database"
 msgstr ""
 
-#: src/addressbook.c:535
+#: src/addressbook.c:530
 msgid "Timeout performing LDAP operation"
 msgstr ""
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error in LDAP search criteria"
 msgstr ""
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "LDAP search terminated on request"
 msgstr ""
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error starting STARTTLS connection"
 msgstr ""
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Distinguished Name (dn) is missing"
 msgstr ""
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Missing required information"
 msgstr ""
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "Another contact exists with that key"
 msgstr ""
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "Strong(er) authentication required"
 msgstr ""
 
-#: src/addressbook.c:911
+#: src/addressbook.c:906
 msgid "Sources"
 msgstr ""
 
-#: src/addressbook.c:915 src/prefs_matcher.c:642 src/prefs_other.c:491
-#: src/toolbar.c:268 src/toolbar.c:2523
+#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
+#: src/toolbar.c:272 src/toolbar.c:2564
 msgid "Address book"
 msgstr ""
 
-#: src/addressbook.c:1108 src/editldap.c:777
+#: src/addressbook.c:1103 src/editldap.c:777
 msgid "Search"
 msgstr ""
 
-#: src/addressbook.c:1165 src/compose.c:666 src/messageview.c:231
-#: src/plugins/managesieve/sieve_editor.c:102
-msgid "_Find"
-msgstr ""
-
-#: src/addressbook.c:1480
+#: src/addressbook.c:1475
 msgid "Delete group"
 msgstr ""
 
-#: src/addressbook.c:1481
+#: src/addressbook.c:1476
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2208
+#: src/addressbook.c:2205
 msgid "Cannot paste. Target address book is read-only."
 msgstr ""
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2215
 msgid "Cannot paste into an address group."
 msgstr ""
 
-#: src/addressbook.c:2953
+#: src/addressbook.c:2950
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 
-#: 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
+#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
+#: src/toolbar.c:507
 msgid "Delete"
 msgstr ""
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2963
 #, 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: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
+#: src/addressbook.c:2966 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:193
 msgid "Delete folder"
 msgstr ""
 
-#: src/addressbook.c:2969
+#: src/addressbook.c:2967
 msgid "Delete _folder only"
 msgstr ""
 
-#: src/addressbook.c:2969
+#: src/addressbook.c:2968
 msgid "Delete folder and _addresses"
 msgstr ""
 
-#: src/addressbook.c:2980
+#: src/addressbook.c:2979
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2987
+#: src/addressbook.c:2986
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
-#: src/addressbook.c:3101
+#: src/addressbook.c:3100
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
-#: src/addressbook.c:3239 src/addressbook.c:3288
+#: src/addressbook.c:3238 src/addressbook.c:3288
 msgid "New Contacts"
 msgstr ""
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4127
 msgid "New user, could not save index file."
 msgstr ""
 
-#: src/addressbook.c:4129
+#: src/addressbook.c:4131
 msgid "New user, could not save address book files."
 msgstr ""
 
-#: src/addressbook.c:4139
+#: src/addressbook.c:4141
 msgid "Old address book converted successfully."
 msgstr ""
 
-#: src/addressbook.c:4144
+#: src/addressbook.c:4146
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4157
+#: src/addressbook.c:4159
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:4163
+#: src/addressbook.c:4165
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4168
+#: src/addressbook.c:4170
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:4175 src/addressbook.c:4181
+#: src/addressbook.c:4177 src/addressbook.c:4182
 msgid "Addressbook conversion error"
 msgstr ""
 
-#: src/addressbook.c:4296
+#: src/addressbook.c:4297
 msgid "Addressbook Error"
 msgstr ""
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4298
 msgid "Could not read address index"
 msgstr ""
 
-#: src/addressbook.c:4628
+#: src/addressbook.c:4630
 msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:4958 src/prefs_send.c:220
+#: src/addressbook.c:4960 src/prefs_send.c:220
 msgid "Interface"
 msgstr ""
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:4972
 msgid "Address Books"
 msgstr ""
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4984
 msgid "Person"
 msgstr ""
 
-#: src/addressbook.c:5018 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3421 src/prefs_folder_column.c:77
+#: src/addressbook.c:5020 src/exporthtml.c:881 src/folderview.c:362
+#: src/folderview.c:450 src/prefs_account.c:3422 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr ""
 
-#: src/addressbook.c:5030
+#: src/addressbook.c:5032
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:5042 src/addressbook.c:5054
+#: src/addressbook.c:5044 src/addressbook.c:5056
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:5066
+#: src/addressbook.c:5068
 msgid "LDAP servers"
 msgstr ""
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5080
 msgid "LDAP Query"
 msgstr ""
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:369 src/expldifdlg.c:386
-#: src/exporthtml.c:985 src/importldif.c:539
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:374 src/expldifdlg.c:388
+#: src/exporthtml.c:981 src/importldif.c:541
 msgid "Address Book"
 msgstr ""
 
@@ -1061,8 +1098,8 @@ msgstr ""
 msgid "Header Fields"
 msgstr ""
 
-#: src/addrgather.c:585 src/exphtmldlg.c:635 src/expldifdlg.c:703
-#: src/importldif.c:965
+#: src/addrgather.c:585 src/exphtmldlg.c:640 src/expldifdlg.c:705
+#: src/importldif.c:967
 msgid "Finish"
 msgstr ""
 
@@ -1098,27 +1135,27 @@ msgstr ""
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
-#: src/alertpanel.c:144 src/compose.c:9787
+#: src/alertpanel.c:154 src/compose.c:9838
 msgid "Notice"
 msgstr ""
 
-#: src/alertpanel.c:157 src/compose.c:5859 src/compose.c:6404
-#: src/compose.c:12187 src/file_checker.c:83 src/file_checker.c:107
-#: src/messageview.c:856 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5071
+#: src/alertpanel.c:167 src/compose.c:5880 src/compose.c:6429
+#: src/compose.c:12248 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/plugins/pgpcore/sgpgme.c:1000
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5085
 msgid "Warning"
 msgstr ""
 
-#: 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
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr ""
 
-#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:204 src/gtk/progressdialog.c:92
 msgid "_View log"
 msgstr ""
 
-#: src/alertpanel.c:357
+#: src/alertpanel.c:372
 msgid "Show this message next time"
 msgstr ""
 
@@ -1171,54 +1208,54 @@ msgid "a notifier"
 msgstr ""
 
 #: src/common/plugin.c:77
-msgid "an utility"
+msgid "a utility"
 msgstr ""
 
 #: src/common/plugin.c:78
 msgid "things"
 msgstr ""
 
-#: src/common/plugin.c:335
+#: src/common/plugin.c:336
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 
-#: src/common/plugin.c:438
+#: src/common/plugin.c:439
 msgid "Plugin already loaded"
 msgstr ""
 
-#: src/common/plugin.c:449
+#: src/common/plugin.c:450
 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 
-#: src/common/plugin.c:483
+#: src/common/plugin.c:484
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 
-#: src/common/plugin.c:492
+#: src/common/plugin.c:493
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
-#: src/common/plugin.c:770
+#: src/common/plugin.c:774
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
 
-#: src/common/plugin.c:773
+#: src/common/plugin.c:777
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 
-#: src/common/plugin.c:782
+#: src/common/plugin.c:786
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 
-#: src/common/plugin.c:784
+#: src/common/plugin.c:788
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
@@ -1255,109 +1292,109 @@ msgstr ""
 msgid "couldn't start STARTTLS session\n"
 msgstr ""
 
-#: src/common/socket.c:571
+#: src/common/socket.c:566
 msgid "Socket IO timeout.\n"
 msgstr ""
 
-#: src/common/socket.c:600
+#: src/common/socket.c:595
 msgid "Connection timed out.\n"
 msgstr ""
 
-#: src/common/socket.c:740
+#: src/common/socket.c:735
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr ""
 
-#: src/common/socket.c:980
+#: src/common/socket.c:975
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr ""
 
-#: src/common/socket.c:1072
+#: src/common/socket.c:1067
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr ""
 
-#: src/common/socket.c:1385
+#: src/common/socket.c:1380
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:338
+#: src/common/ssl_certificate.c:334
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:346
+#: src/common/ssl_certificate.c:342
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:355
+#: src/common/ssl_certificate.c:351
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:636
 msgid "Internal error"
 msgstr ""
 
-#: src/common/ssl_certificate.c:645
+#: src/common/ssl_certificate.c:641
 msgid "Uncheckable"
 msgstr ""
 
-#: src/common/ssl_certificate.c:649
+#: src/common/ssl_certificate.c:645
 msgid "Self-signed certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:652
+#: src/common/ssl_certificate.c:648
 msgid "Revoked certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:654
+#: src/common/ssl_certificate.c:650
 msgid "No certificate issuer found"
 msgstr ""
 
-#: src/common/ssl_certificate.c:656
+#: src/common/ssl_certificate.c:652
 msgid "Certificate issuer is not a CA"
 msgstr ""
 
-#: src/common/ssl_certificate.c:881
+#: src/common/ssl_certificate.c:877
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:885
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:904
+#: src/common/ssl_certificate.c:900
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:908
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1056
+#: src/common/ssl_certificate.c:1052
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1059
+#: src/common/ssl_certificate.c:1055
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1063
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1084 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
@@ -1368,237 +1405,237 @@ msgstr ""
 msgid "(Subject cleared by RegExp)"
 msgstr ""
 
-#: src/common/utils.c:200
+#: src/common/utils.c:184
 #, c-format
 msgid "%dB"
 msgstr ""
 
-#: src/common/utils.c:201
+#: src/common/utils.c:185
 #, c-format
-msgid "%d.%02dKB"
+msgid "%d.%02dKiB"
 msgstr ""
 
-#: src/common/utils.c:202
+#: src/common/utils.c:186
 #, c-format
-msgid "%d.%02dMB"
+msgid "%d.%02dMiB"
 msgstr ""
 
-#: src/common/utils.c:203
+#: src/common/utils.c:187
 #, c-format
-msgid "%.2fGB"
+msgid "%.2fGiB"
 msgstr ""
 
-#: src/common/utils.c:4114
+#: src/common/utils.c:4118
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr ""
 
-#: src/common/utils.c:4115
+#: src/common/utils.c:4119
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr ""
 
-#: src/common/utils.c:4116
+#: src/common/utils.c:4120
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr ""
 
-#: src/common/utils.c:4117
+#: src/common/utils.c:4121
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr ""
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4122
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr ""
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4123
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr ""
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4124
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr ""
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4126
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr ""
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4127
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr ""
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4128
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr ""
 
-#: src/common/utils.c:4125
+#: src/common/utils.c:4129
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr ""
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4130
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4131
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr ""
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4132
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr ""
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4133
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr ""
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4134
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr ""
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4135
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr ""
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4136
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr ""
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4137
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr ""
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4139
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr ""
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4140
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr ""
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4141
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr ""
 
-#: src/common/utils.c:4138
+#: src/common/utils.c:4142
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr ""
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4143
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr ""
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4144
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr ""
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4145
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr ""
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4147
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr ""
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4148
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr ""
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4149
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr ""
 
-#: src/common/utils.c:4146
+#: src/common/utils.c:4150
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr ""
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4151
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4152
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr ""
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4153
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr ""
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4154
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr ""
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4155
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr ""
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4156
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr ""
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4157
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr ""
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4158
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr ""
 
-#: src/common/utils.c:4165
+#: src/common/utils.c:4169
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr ""
 
-#: src/common/utils.c:4166
+#: src/common/utils.c:4170
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr ""
 
-#: src/common/utils.c:4167
+#: src/common/utils.c:4171
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr ""
 
-#: src/common/utils.c:4168
+#: src/common/utils.c:4172
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr ""
 
-#: src/compose.c:201
+#: src/compose.c:200
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1606,425 +1643,425 @@ msgid ""
 "Signing and encrypting have been disabled for this message."
 msgstr ""
 
-#: src/compose.c:599
+#: src/compose.c:604
 msgid "_Add..."
 msgstr ""
 
-#: src/compose.c:600 src/editgroup.c:346 src/plugins/mailmbox/plugin_gtk.c:302
-#: src/plugins/rssyl/rssyl_cb_menu.c:323 src/prefs_actions.c:337
-#: src/prefs_display_header.c:378 src/prefs_filtering_action.c:591
-#: src/prefs_folder_column.c:278 src/prefs_matcher.c:802
-#: src/prefs_summary_column.c:292 src/prefs_summary_open.c:247
-#: src/prefs_themes.c:1105
+#: src/compose.c:605 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:361
+#: src/prefs_actions.c:336 src/prefs_display_header.c:378
+#: src/prefs_filtering_action.c:591 src/prefs_folder_column.c:278
+#: src/prefs_matcher.c:802 src/prefs_summary_column.c:292
+#: src/prefs_summary_open.c:247 src/prefs_themes.c:1200
 msgid "_Remove"
 msgstr ""
 
-#: src/compose.c:602 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:255
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:609 src/mainwindow.c:519 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
 msgid "_Message"
 msgstr ""
 
-#: src/compose.c:612
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr ""
 
-#: src/compose.c:614 src/compose.c:681
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr ""
 
-#: src/compose.c:616 src/mainwindow.c:522 src/messageview.c:216
+#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
 msgid "_Help"
 msgstr ""
 
-#: src/compose.c:618
+#: src/compose.c:623
 msgid "S_end"
 msgstr ""
 
-#: src/compose.c:619
+#: src/compose.c:624
 msgid "Send _later"
 msgstr ""
 
-#: src/compose.c:622
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr ""
 
-#: src/compose.c:623
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr ""
 
-#: src/compose.c:624
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr ""
 
-#: src/compose.c:625
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr ""
 
-#: src/compose.c:629
+#: src/compose.c:634
 msgid "_Print"
 msgstr ""
 
-#: src/compose.c:634 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr ""
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr ""
 
-#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr ""
 
-#: src/compose.c:642
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr ""
 
-#: src/compose.c:643
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr ""
 
-#: src/compose.c:644
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr ""
 
-#: src/compose.c:645
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:647 src/mainwindow.c:552
+#: src/compose.c:652 src/mainwindow.c:553
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
 
-#: src/compose.c:649
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr ""
 
-#: src/compose.c:650
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr ""
 
-#: src/compose.c:651
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr ""
 
-#: src/compose.c:652
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr ""
 
-#: src/compose.c:653
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr ""
 
-#: src/compose.c:654
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:655
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr ""
 
-#: src/compose.c:656
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr ""
 
-#: src/compose.c:657
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr ""
 
-#: src/compose.c:658
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr ""
 
-#: src/compose.c:659
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr ""
 
-#: src/compose.c:660
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr ""
 
-#: src/compose.c:661
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr ""
 
-#: src/compose.c:662
+#: src/compose.c:667
 msgid "Delete line"
 msgstr ""
 
-#: src/compose.c:663
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr ""
 
-#: src/compose.c:669
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:670
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr ""
 
-#: src/compose.c:672
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr ""
 
-#: src/compose.c:675
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr ""
 
-#: src/compose.c:676
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr ""
 
-#: src/compose.c:677
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr ""
 
-#: src/compose.c:678
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr ""
 
-#: src/compose.c:685
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr ""
 
-#: src/compose.c:687
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr ""
 
-#: src/compose.c:691
+#: src/compose.c:696
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:693 src/mainwindow.c:614 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
 msgid "Character _encoding"
 msgstr ""
 
-#: src/compose.c:698 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
 msgid "Western European"
 msgstr ""
 
-#: src/compose.c:699 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
 msgid "Baltic"
 msgstr ""
 
-#: src/compose.c:700 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
 msgid "Hebrew"
 msgstr ""
 
-#: src/compose.c:701 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
 msgid "Arabic"
 msgstr ""
 
-#: src/compose.c:702 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
 msgid "Cyrillic"
 msgstr ""
 
-#: src/compose.c:703 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
 msgid "Japanese"
 msgstr ""
 
-#: src/compose.c:704 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
 msgid "Chinese"
 msgstr ""
 
-#: src/compose.c:705 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
 msgid "Korean"
 msgstr ""
 
-#: src/compose.c:706 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
 msgid "Thai"
 msgstr ""
 
-#: src/compose.c:709 src/mainwindow.c:737 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
 msgid "_Address book"
 msgstr ""
 
-#: src/compose.c:711
+#: src/compose.c:716
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:713 src/mainwindow.c:765 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
 msgid "Actio_ns"
 msgstr ""
 
-#: src/compose.c:717 src/mainwindow.c:819 src/messageview.c:340
+#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
 msgid "_About"
 msgstr ""
 
-#: src/compose.c:722
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr ""
 
-#: src/compose.c:723
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr ""
 
-#: src/compose.c:724
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr ""
 
-#: src/compose.c:725
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr ""
 
-#: src/compose.c:726
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr ""
 
-#: src/compose.c:727
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr ""
 
-#: src/compose.c:728
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr ""
 
-#: src/compose.c:733 src/compose.c:743
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:734 src/mainwindow.c:668 src/messageview.c:305
-#: src/summaryview.c:428
+#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/summaryview.c:429
 msgid "_All"
 msgstr ""
 
-#: src/compose.c:735 src/mainwindow.c:669 src/messageview.c:306
-#: src/summaryview.c:429
+#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/summaryview.c:430
 msgid "_Sender"
 msgstr ""
 
-#: src/compose.c:736
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr ""
 
-#: src/compose.c:741
+#: src/compose.c:746
 msgid "_Highest"
 msgstr ""
 
-#: src/compose.c:742
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr ""
 
-#: src/compose.c:744
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr ""
 
-#: src/compose.c:745
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
 msgid "_Automatic"
 msgstr ""
 
-#: src/compose.c:751 src/mainwindow.c:885 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr ""
 
-#: src/compose.c:752 src/mainwindow.c:886 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:889 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr ""
 
-#: src/compose.c:756 src/mainwindow.c:890 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr ""
 
-#: src/compose.c:759 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:896 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr ""
 
-#: src/compose.c:764 src/mainwindow.c:898 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:901 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr ""
 
-#: src/compose.c:1035
+#: src/compose.c:1040
 msgid "New message From format error."
 msgstr ""
 
-#: src/compose.c:1128
+#: src/compose.c:1133
 msgid "New message subject format error."
 msgstr ""
 
-#: src/compose.c:1160 src/quote_fmt.c:565
+#: src/compose.c:1165 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:1429
+#: src/compose.c:1434
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 
-#: src/compose.c:1614 src/quote_fmt.c:582
+#: src/compose.c:1619 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1663 src/quote_fmt.c:585
+#: src/compose.c:1668 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1804 src/compose.c:2005 src/quote_fmt.c:602
+#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1865 src/quote_fmt.c:605
+#: src/compose.c:1870 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2048
+#: src/compose.c:2053
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2559
+#: src/compose.c:2575
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2630 src/gtk/headers.h:14
+#: src/compose.c:2646 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2633 src/gtk/headers.h:15
+#: src/compose.c:2649 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2636 src/gtk/headers.h:12
+#: src/compose.c:2652 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2639 src/compose.c:5014 src/compose.c:5016
+#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2642 src/gtk/headers.h:34
+#: src/compose.c:2658 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2645 src/gtk/headers.h:17
+#: src/compose.c:2661 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2649 src/compose.c:5011 src/compose.c:5019
+#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr ""
 
-#: src/compose.c:2845
+#: src/compose.c:2861
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2851
+#: src/compose.c:2867
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2035,131 +2072,134 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3131
+#: src/compose.c:3147
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3660
+#: src/compose.c:3680
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3678
+#: src/compose.c:3698
 #, 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:3681
+#: src/compose.c:3701
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3682 src/compose.c:10777 src/compose.c:11669
+#: src/compose.c:3702 src/compose.c:10831 src/compose.c:11731
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3807
+#: src/compose.c:3827
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3808
+#: src/compose.c:3828
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3809
+#: src/compose.c:3829
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3818
+#: src/compose.c:3838
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3845
+#: src/compose.c:3865
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4855 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4865 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4867 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4894 src/messageview.c:885
+#: src/compose.c:4919 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:5111 src/compose.c:5148
+#: src/compose.c:5136 src/compose.c:5173
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5113 src/compose.c:5150 src/compose.c:5188 src/compose.c:5231
-#: src/prefs_account.c:4073 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5138 src/compose.c:5175 src/compose.c:5213 src/compose.c:5256
+#: src/prefs_account.c:4080 src/toolbar.c:497 src/toolbar.c:530
 msgid "Send"
 msgstr ""
 
-#: src/compose.c:5115 src/compose.c:5152 src/compose.c:5189 src/compose.c:5232
-#: src/compose.c:5797 src/folderview.c:2548 src/messageview.c:857
-#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3055
+#: src/compose.c:5140 src/compose.c:5177 src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5822 src/folderview.c:2555 src/messageview.c:862
+#: src/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
 msgid "_Send"
 msgstr ""
 
-#: src/compose.c:5169
+#: src/compose.c:5194
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5184
+#: src/compose.c:5209
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5185 src/compose.c:5228
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5210 src/compose.c:5253
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5186 src/compose.c:5229
-#: src/plugins/attachwarner/attachwarner.c:215
+#: src/compose.c:5211 src/compose.c:5254
+#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5188 src/compose.c:5231 src/toolbar.c:520
+#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5189 src/compose.c:5232
+#: src/compose.c:5214 src/compose.c:5257
 msgid "_Queue"
 msgstr ""
 
-#: src/compose.c:5227
+#: src/compose.c:5252
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr ""
 
-#: src/compose.c:5256
+#: src/compose.c:5281
 msgid "Could not queue message."
 msgstr ""
 
-#: src/compose.c:5259
+#: src/compose.c:5284
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2167,7 +2207,7 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:5263
+#: src/compose.c:5288
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2175,7 +2215,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5268
+#: src/compose.c:5293
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2183,34 +2223,34 @@ msgid ""
 "Encryption failed: %s"
 msgstr ""
 
-#: src/compose.c:5273
+#: src/compose.c:5298
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5277
+#: src/compose.c:5302
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
-#: src/compose.c:5340 src/compose.c:5400
+#: src/compose.c:5365 src/compose.c:5425
 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:5396
+#: src/compose.c:5421
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5793
+#: src/compose.c:5818
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2218,7 +2258,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5855
+#: src/compose.c:5876
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2227,174 +2267,179 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:6090
+#: src/compose.c:6115
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:6091
+#: src/compose.c:6116
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:6140
+#: src/compose.c:6165
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:6149
+#: src/compose.c:6174
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6403
+#: src/compose.c:6428
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6405 src/mainwindow.c:659 src/toolbar.c:276 src/toolbar.c:2564
+#: src/compose.c:6430 src/mainwindow.c:660 src/toolbar.c:280 src/toolbar.c:2605
 msgid "Cancel sending"
 msgstr ""
 
-#: src/compose.c:6405
+#: src/compose.c:6431
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6461
+#: src/compose.c:6487
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:7061
+#: src/compose.c:7094
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:7216
+#: src/compose.c:7249
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:7220 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
-#: src/compose.c:7455
+#: src/compose.c:7488
 msgid "Mime type"
 msgstr ""
 
-#: 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
+#: src/compose.c:7494 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:456
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:635
+#: src/prefs_summary_column.c:84 src/summaryview.c:468
 msgid "Size"
 msgstr ""
 
-#: src/compose.c:7523
+#: src/compose.c:7556
 msgid "Save Message to "
 msgstr ""
 
-#: src/compose.c:7556 src/editjpilot.c:277 src/editldap.c:514
+#: src/compose.c:7589 src/editjpilot.c:277 src/editldap.c:514
 #: src/editvcard.c:193 src/export.c:161 src/import.c:160 src/importmutt.c:240
-#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1081
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1078
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
-#: src/plugins/bsfilter/bsfilter_gtk.c:181
+#: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
 #: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "_Browse"
 msgstr ""
 
-#: src/compose.c:7572
+#: src/compose.c:7605
 msgid "Select folder to save message to"
 msgstr ""
 
-#: src/compose.c:8026
+#: src/compose.c:8059
 msgid "Hea_der"
 msgstr ""
 
-#: src/compose.c:8031
+#: src/compose.c:8064
 msgid "_Attachments"
 msgstr ""
 
-#: src/compose.c:8045
+#: src/compose.c:8078
 msgid "Othe_rs"
 msgstr ""
 
-#: src/compose.c:8060
+#: src/compose.c:8093
 msgid "S_ubject:"
 msgstr ""
 
-#: src/compose.c:8284
+#: src/compose.c:8317
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:8435
+#: src/compose.c:8468
 msgid "_From:"
 msgstr ""
 
-#: src/compose.c:8443
+#: src/compose.c:8476
 msgid "Account to use for this email"
 msgstr ""
 
-#: src/compose.c:8445
+#: src/compose.c:8478
 msgid "Sender address to be used"
 msgstr ""
 
-#: src/compose.c:8627
+#: src/compose.c:8660
 #, 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:8738 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8771 src/plugins/archive/archiver_gtk.c:1177
 msgid "_None"
 msgstr ""
 
-#: src/compose.c:8839 src/prefs_template.c:745
+#: src/compose.c:8872 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:8936
+#: src/compose.c:8969
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr ""
 
-#: src/compose.c:9360
+#: src/compose.c:9394
 msgid "Invalid MIME type."
 msgstr ""
 
-#: src/compose.c:9375
+#: src/compose.c:9409
 msgid "File doesn't exist or is empty."
 msgstr ""
 
-#: src/compose.c:9446
+#: src/compose.c:9480
 msgid "Properties"
 msgstr ""
 
-#: src/compose.c:9464
+#: src/compose.c:9498
 msgid "MIME type"
 msgstr ""
 
-#: src/compose.c:9497
+#: src/compose.c:9531
 msgid "Encoding"
 msgstr ""
 
-#: src/compose.c:9517
+#: src/compose.c:9551
 msgid "Path"
 msgstr ""
 
-#: src/compose.c:9518
+#: src/compose.c:9552
 msgid "File name"
 msgstr ""
 
-#: src/compose.c:9613
+#: src/compose.c:9648
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:9671
+#: src/compose.c:9677
+msgid ""
+"Socket communication with an external editor is not available on Windows."
+msgstr ""
+
+#: src/compose.c:9710
 #, c-format
 msgid ""
 "Could not spawn the following command:\n"
@@ -2402,105 +2447,121 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/compose.c:9711
+#: src/compose.c:9754
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr ""
 
-#: src/compose.c:9784
+#: src/compose.c:9828
+msgid "process id: %"
+msgstr ""
+
+#: src/compose.c:9830
+#, c-format
+msgid "process id: %d"
+msgstr ""
+
+#: src/compose.c:9835
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process id: %d"
+"%s"
 msgstr ""
 
-#: src/compose.c:10191 src/messageview.c:1088
+#: src/compose.c:10245 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
-#: src/compose.c:10393
+#: src/compose.c:10448
 msgid "Could not save draft."
 msgstr ""
 
-#: src/compose.c:10397
+#: src/compose.c:10452
 msgid "Could not save draft"
 msgstr ""
 
-#: src/compose.c:10398
+#: src/compose.c:10453
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: src/compose.c:10400
+#: src/compose.c:10455
 msgid "_Cancel exit"
 msgstr ""
 
-#: src/compose.c:10400
+#: src/compose.c:10455
 msgid "_Discard email"
 msgstr ""
 
-#: src/compose.c:10589 src/compose.c:10603
+#: src/compose.c:10643 src/compose.c:10657
 msgid "Select file"
 msgstr ""
 
-#: src/compose.c:10617
+#: src/compose.c:10671
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
-#: src/compose.c:10619
+#: src/compose.c:10673
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: src/compose.c:10696
+#: src/compose.c:10750
 msgid "Discard message"
 msgstr ""
 
-#: src/compose.c:10697
+#: src/compose.c:10751
 msgid "This message has been modified. Discard it?"
 msgstr ""
 
-#: src/compose.c:10698 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10752 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr ""
 
-#: src/compose.c:10698 src/compose.c:10703
+#: src/compose.c:10752 src/compose.c:10757
 msgid "_Save to Drafts"
 msgstr ""
 
-#: src/compose.c:10701 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr ""
 
-#: src/compose.c:10702
+#: src/compose.c:10756
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/compose.c:10703
+#: src/compose.c:10757
 msgid "_Don't save"
 msgstr ""
 
-#: src/compose.c:10774
+#: src/compose.c:10828
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr ""
 
-#: src/compose.c:10776
+#: src/compose.c:10830
 msgid "Apply template"
 msgstr ""
 
-#: src/compose.c:10777 src/prefs_actions.c:329 src/prefs_filtering_action.c:585
+#: src/compose.c:10831 src/prefs_actions.c:328 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:463 src/prefs_matcher.c:796 src/prefs_template.c:307
-#: src/prefs_toolbar.c:1003
+#: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr ""
 
-#: src/compose.c:11662
+#: src/compose.c:10908
+#, c-format
+msgid ""
+"Size of pasted text exceeds limit (%dKiB) for paste.\n"
+"Attach as file instead."
+msgstr ""
+
+#: src/compose.c:11724
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2511,20 +2572,20 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:11668
+#: src/compose.c:11730
 msgid "Insert or attach?"
 msgstr ""
 
-#: src/compose.c:11669
+#: src/compose.c:11731
 msgid "_Attach"
 msgstr ""
 
-#: src/compose.c:11885
+#: src/compose.c:11946
 #, c-format
 msgid "Quote format error at line %d."
 msgstr ""
 
-#: src/compose.c:12181
+#: src/compose.c:12242
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2536,35 +2597,35 @@ msgstr ""
 msgid "Claws Mail process (%ld) received signal %ld"
 msgstr ""
 
-#: src/crash.c:186
+#: src/crash.c:189
 msgid "Claws Mail has crashed"
 msgstr ""
 
-#: src/crash.c:203
+#: src/crash.c:206
 #, c-format
 msgid ""
 "%s.\n"
 "Please file a bug report and include the information below."
 msgstr ""
 
-#: src/crash.c:208
+#: src/crash.c:211
 msgid "Debug log"
 msgstr ""
 
-#: src/crash.c:252 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:539
-#: src/uri_opener.c:204
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:504 src/toolbar.c:550
+#: src/uri_opener.c:226
 msgid "Close"
 msgstr ""
 
-#: src/crash.c:257
+#: src/crash.c:260
 msgid "Save..."
 msgstr ""
 
-#: src/crash.c:262
+#: src/crash.c:265
 msgid "Create bug report"
 msgstr ""
 
-#: src/crash.c:312
+#: src/crash.c:315
 msgid "Save crash information"
 msgstr ""
 
@@ -2612,7 +2673,7 @@ msgstr ""
 msgid "A Name and Value must be supplied."
 msgstr ""
 
-#: src/editaddress.c:820 src/prefs_folder_item.c:1751
+#: src/editaddress.c:820 src/prefs_folder_item.c:1827
 msgid "Discard"
 msgstr ""
 
@@ -2620,73 +2681,73 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
-#: src/editaddress.c:851 src/editaddress.c:901
+#: src/editaddress.c:851 src/editaddress.c:902
 msgid "Edit Person Data"
 msgstr ""
 
-#: src/editaddress.c:930
+#: src/editaddress.c:931
 msgid "Choose a picture"
 msgstr ""
 
-#: src/editaddress.c:949
+#: src/editaddress.c:950
 #, c-format
 msgid ""
 "Failed to import image: \n"
 "%s"
 msgstr ""
 
-#: src/editaddress.c:991
+#: src/editaddress.c:992
 msgid "_Set picture"
 msgstr ""
 
-#: src/editaddress.c:992
+#: src/editaddress.c:993
 msgid "_Unset picture"
 msgstr ""
 
-#: src/editaddress.c:1048
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr ""
 
-#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:506
-#: src/exporthtml.c:762 src/ldif.c:747
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:508
+#: src/exporthtml.c:758 src/ldif.c:751
 msgid "Display Name"
 msgstr ""
 
-#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:755
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:759
 msgid "Last Name"
 msgstr ""
 
-#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:751
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:755
 msgid "First Name"
 msgstr ""
 
-#: src/editaddress.c:1113 src/editaddress.c:1115
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr ""
 
-#: src/editaddress.c:1251 src/editaddress.c:1292
+#: src/editaddress.c:1253 src/editaddress.c:1294
 msgid "Alias"
 msgstr ""
 
-#: src/editaddress.c:1480 src/editaddress.c:1507 src/editaddress.c:1526
+#: src/editaddress.c:1483 src/editaddress.c:1510 src/editaddress.c:1529
 #: src/editaddress_other_attributes_ldap.c:374
 #: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:217
 msgid "Value"
 msgstr ""
 
-#: src/editaddress.c:1594
+#: src/editaddress.c:1597
 msgid "_User Data"
 msgstr ""
 
-#: src/editaddress.c:1595
+#: src/editaddress.c:1598
 msgid "_Email Addresses"
 msgstr ""
 
-#: src/editaddress.c:1598 src/editaddress.c:1601
+#: src/editaddress.c:1601 src/editaddress.c:1604
 msgid "O_ther Attributes"
 msgstr ""
 
-#: src/editaddress.c:1769
+#: src/editaddress.c:1772
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2715,7 +2776,6 @@ msgstr ""
 
 #: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
 #: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2443
-#: src/wizard.c:1200 src/wizard.c:1631
 msgid "File"
 msgstr ""
 
@@ -2723,53 +2783,49 @@ msgstr ""
 msgid "Add New Addressbook"
 msgstr ""
 
-#: src/editgroup.c:100
+#: src/editgroup.c:97
 msgid "A Group Name must be supplied."
 msgstr ""
 
-#: src/editgroup.c:294
-msgid "Edit Group Data"
+#: src/editgroup.c:292
+msgid "Edit group data"
 msgstr ""
 
-#: src/editgroup.c:323 src/exporthtml.c:598
+#: src/editgroup.c:321 src/exporthtml.c:594
 msgid "Group Name"
 msgstr ""
 
-#: src/editgroup.c:344
-msgid "Addresses in Group"
-msgstr ""
-
-#: src/editgroup.c:378
+#: src/editgroup.c:342
 msgid "Available Addresses"
 msgstr ""
 
-#: src/editgroup.c:452
-msgid "Move Email Addresses to or from Group with arrow buttons"
+#: src/editgroup.c:375
+msgid "Addresses in Group"
 msgstr ""
 
-#: src/editgroup.c:500
-msgid "Edit Group Details"
+#: src/editgroup.c:494
+msgid "Edit group details"
 msgstr ""
 
-#: src/editgroup.c:503
-msgid "Add New Group"
+#: src/editgroup.c:496
+msgid "Add new group"
 msgstr ""
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Edit folder"
 msgstr ""
 
-#: src/editgroup.c:552
+#: src/editgroup.c:543
 msgid "Input the new name of folder:"
 msgstr ""
 
-#: 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
+#: src/editgroup.c:546 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:129
 msgid "New folder"
 msgstr ""
 
-#: 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
+#: src/editgroup.c:547 src/foldersel.c:571 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:130
 msgid "Input the name of new folder:"
 msgstr ""
 
@@ -2798,13 +2854,13 @@ msgid "Edit LDAP - Select Search Base"
 msgstr ""
 
 #: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3190
-#: src/prefs_proxy.c:98
+#: src/prefs_proxy.c:100
 msgid "Hostname"
 msgstr ""
 
 #: src/editldap_basedn.c:180 src/editldap.c:456
 #: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3197
-#: src/prefs_proxy.c:105 src/ssl_manager.c:117
+#: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr ""
 
@@ -2864,7 +2920,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: src/editldap.c:468 src/prefs_account.c:4164
+#: src/editldap.c:468 src/prefs_account.c:4171
 msgid "TLS"
 msgstr ""
 
@@ -2969,11 +3025,11 @@ msgstr ""
 
 #: 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\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
+"Searches for names and addresses can be performed either using \"begins-"
+"with\" or \"contains\" search term. Check this option to perform a "
+"\"contains\" search; this type of search usually takes longer to complete. "
+"Note that for performance reasons, address completion uses \"begins-with\" "
+"for all searches against other address interfaces."
 msgstr ""
 
 #: src/editldap.c:697
@@ -2998,7 +3054,7 @@ msgstr ""
 
 #: src/editldap.c:727 src/prefs_account.c:1444 src/prefs_account.c:2073
 #: src/prefs_account.c:3002 src/prefs_account.c:3030 src/prefs_account.c:3231
-#: src/prefs_proxy.c:142
+#: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr ""
 
@@ -3019,11 +3075,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:776 src/prefs_account.c:4037
+#: src/editldap.c:776 src/prefs_account.c:4044
 msgid "Basic"
 msgstr ""
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:877
+#: src/editldap.c:778 src/gtk/quicksearch.c:878
 msgid "Extended"
 msgstr ""
 
@@ -3031,46 +3087,57 @@ msgstr ""
 msgid "Add New LDAP Server"
 msgstr ""
 
-#: src/edittags.c:191 src/gtk/quicksearch.c:865
-#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:640
+#: src/edittags.c:135
+msgctxt "Window title"
+msgid "Tags configuration"
+msgstr ""
+
+#: src/edittags.c:140
+msgctxt "Window title"
+msgid "Modify tags"
+msgstr ""
+
+#: src/edittags.c:203 src/gtk/quicksearch.c:866
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:642
 msgid "Tag"
 msgstr ""
 
-#: src/edittags.c:220
+#: src/edittags.c:232
 msgid "Delete tag"
 msgstr ""
 
-#: src/edittags.c:221
+#: src/edittags.c:233
 msgid "Do you really want to delete this tag?"
 msgstr ""
 
-#: src/edittags.c:256
+#: src/edittags.c:268
 msgid "Delete all tags"
 msgstr ""
 
-#: src/edittags.c:257
+#: src/edittags.c:269
 msgid "Do you really want to delete all tags?"
 msgstr ""
 
-#: src/edittags.c:427
+#: src/edittags.c:441
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
 
-#: src/edittags.c:469
-msgid "Tag is not set."
+#: src/edittags.c:572
+msgid "New tag:"
 msgstr ""
 
-#: src/edittags.c:547
-msgctxt "Dialog title"
-msgid "Apply tags"
+#: src/edittags.c:584
+msgid "Add the new tag"
 msgstr ""
 
-#: src/edittags.c:564
-msgid "New tag:"
+#: src/edittags.c:589
+msgid "Delete the selected tag"
 msgstr ""
 
-#: src/edittags.c:597
-msgid "Please select tags to apply/remove. Changes are immediate."
+#: src/edittags.c:608
+msgid ""
+"Choose the tag(s) for the message(s).\n"
+"Changes are immediately applied."
 msgstr ""
 
 #: src/editvcard.c:94
@@ -3124,118 +3191,128 @@ msgstr ""
 msgid "Create directory"
 msgstr ""
 
-#: src/exphtmldlg.c:189
+#: src/exphtmldlg.c:190
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 "%s"
 msgstr ""
 
-#: src/exphtmldlg.c:191 src/expldifdlg.c:201
+#: src/exphtmldlg.c:192 src/expldifdlg.c:201
 msgid "Failed to Create Directory"
 msgstr ""
 
-#: src/exphtmldlg.c:233
+#: src/exphtmldlg.c:235
 msgid "Error creating HTML file"
 msgstr ""
 
-#: src/exphtmldlg.c:319
+#: src/exphtmldlg.c:324
 msgid "Select HTML output file"
 msgstr ""
 
-#: src/exphtmldlg.c:378
+#: src/exphtmldlg.c:383
 msgid "HTML Output File"
 msgstr ""
 
-#: src/exphtmldlg.c:387 src/expldifdlg.c:404 src/export.c:167 src/import.c:166
-#: src/importldif.c:565
+#: src/exphtmldlg.c:392 src/expldifdlg.c:406 src/export.c:167 src/import.c:166
+#: src/importldif.c:567
 msgid "B_rowse"
 msgstr ""
 
-#: src/exphtmldlg.c:436 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
 msgid "Stylesheet"
 msgstr ""
 
-#: 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/exphtmldlg.c:448 src/gtk/colorlabel.c:369 src/gtk/colorlabel.c:495
+#: src/gtk/gtkaspell.c:1567 src/gtk/gtkaspell.c:2202 src/gtk/menu.c:126
+#: src/mainwindow.c:1178 src/plugins/archive/archiver_prefs.c:312
 #: 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:6251
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
 msgid "None"
 msgstr ""
 
-#: src/exphtmldlg.c:444 src/prefs_folder_item.c:528
-#: src/prefs_folder_item.c:1178 src/prefs_folder_item.c:1208
+#: src/exphtmldlg.c:449 src/prefs_folder_item.c:532
+#: src/prefs_folder_item.c:1240 src/prefs_folder_item.c:1271
 #: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr ""
 
-#: src/exphtmldlg.c:445 src/plugins/pgpcore/select-keys.c:240
-#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr ""
 
-#: src/exphtmldlg.c:446
+#: src/exphtmldlg.c:451
 msgid "Custom"
 msgstr ""
 
-#: src/exphtmldlg.c:447
+#: src/exphtmldlg.c:452
 msgid "Custom-2"
 msgstr ""
 
-#: src/exphtmldlg.c:448
+#: src/exphtmldlg.c:453
 msgid "Custom-3"
 msgstr ""
 
-#: src/exphtmldlg.c:449
+#: src/exphtmldlg.c:454
 msgid "Custom-4"
 msgstr ""
 
-#: src/exphtmldlg.c:454
+#: src/exphtmldlg.c:459
 msgid "Full Name Format"
 msgstr ""
 
-#: src/exphtmldlg.c:461
+#: src/exphtmldlg.c:466
 msgid "First Name, Last Name"
 msgstr ""
 
-#: src/exphtmldlg.c:462
+#: src/exphtmldlg.c:467
 msgid "Last Name, First Name"
 msgstr ""
 
-#: src/exphtmldlg.c:467
+#: src/exphtmldlg.c:472
 msgid "Color Banding"
 msgstr "Colour Banding"
 
-#: src/exphtmldlg.c:471
+#: src/exphtmldlg.c:476
 msgid "Format Email Links"
 msgstr ""
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:480
 msgid "Format User Attributes"
 msgstr ""
 
-#: src/exphtmldlg.c:517 src/expldifdlg.c:593 src/importldif.c:837
+#: src/exphtmldlg.c:522 src/expldifdlg.c:595 src/importldif.c:839
 msgid "Address Book:"
 msgstr ""
 
-#: src/exphtmldlg.c:526 src/expldifdlg.c:602 src/importldif.c:846
+#: src/exphtmldlg.c:531 src/expldifdlg.c:604 src/importldif.c:848
 msgid "File Name:"
 msgstr ""
 
-#: src/exphtmldlg.c:535
+#: src/exphtmldlg.c:540
 msgid "Open with Web Browser"
 msgstr ""
 
-#: src/exphtmldlg.c:567
+#: src/exphtmldlg.c:572
 msgid "Export Address Book to HTML File"
 msgstr ""
 
-#: src/exphtmldlg.c:633 src/expldifdlg.c:701 src/importldif.c:963
+#: src/exphtmldlg.c:606 src/expldifdlg.c:671 src/importldif.c:923
+#: src/message_search.c:228 src/summary_search.c:485 src/wizard.c:1830
+msgid "_Previous"
+msgstr ""
+
+#: src/exphtmldlg.c:607 src/expldifdlg.c:672 src/importldif.c:924
+#: src/message_search.c:233 src/summary_search.c:490 src/wizard.c:1831
+msgid "_Next"
+msgstr ""
+
+#: src/exphtmldlg.c:638 src/expldifdlg.c:703 src/importldif.c:965
 msgid "File Info"
 msgstr ""
 
-#: src/exphtmldlg.c:634
+#: src/exphtmldlg.c:639
 msgid "Format"
 msgstr ""
 
@@ -3279,22 +3356,22 @@ msgstr ""
 msgid "Error creating LDIF file"
 msgstr ""
 
-#: src/expldifdlg.c:336
+#: src/expldifdlg.c:338
 msgid "Select LDIF output file"
 msgstr ""
 
-#: src/expldifdlg.c:395
+#: src/expldifdlg.c:397
 msgid "LDIF Output File"
 msgstr ""
 
-#: src/expldifdlg.c:425
+#: src/expldifdlg.c:427
 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:431
+#: src/expldifdlg.c:433
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3304,7 +3381,7 @@ msgstr ""
 "similar to:\n"
 "  cn=Joe Bloggs,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:439
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3314,11 +3391,11 @@ msgstr ""
 "formatted similar to:\n"
 "  mail=joe.bloggs@domain.com,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:481
+#: src/expldifdlg.c:483
 msgid "Suffix"
 msgstr ""
 
-#: src/expldifdlg.c:491
+#: src/expldifdlg.c:493
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3332,15 +3409,15 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organisation Name,c=Country\n"
 
-#: src/expldifdlg.c:498
+#: src/expldifdlg.c:500
 msgid "Relative DN"
 msgstr ""
 
-#: src/expldifdlg.c:505
+#: src/expldifdlg.c:507
 msgid "Unique ID"
 msgstr ""
 
-#: src/expldifdlg.c:512
+#: src/expldifdlg.c:514
 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 "
@@ -3349,11 +3426,11 @@ msgid ""
 "available RDN options that will be used to create the DN."
 msgstr ""
 
-#: src/expldifdlg.c:529
+#: src/expldifdlg.c:531
 msgid "Use DN attribute if present in data"
 msgstr ""
 
-#: src/expldifdlg.c:533
+#: src/expldifdlg.c:535
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3361,25 +3438,25 @@ msgid ""
 "above will be used if the DN user attribute is not found."
 msgstr ""
 
-#: src/expldifdlg.c:542
+#: src/expldifdlg.c:544
 msgid "Exclude record if no Email Address"
 msgstr ""
 
-#: src/expldifdlg.c:546
+#: src/expldifdlg.c:548
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
 msgstr ""
 
-#: src/expldifdlg.c:635
+#: src/expldifdlg.c:637
 msgid "Export Address Book to LDIF File"
 msgstr ""
 
-#: src/expldifdlg.c:702
+#: src/expldifdlg.c:704
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/export.c:112 src/summaryview.c:8463
+#: src/export.c:112 src/summaryview.c:8485
 msgid "Export to mbox file"
 msgstr ""
 
@@ -3415,32 +3492,32 @@ msgstr ""
 msgid "Select folder to export"
 msgstr ""
 
-#: src/exporthtml.c:768
+#: src/exporthtml.c:764
 msgid "Full Name"
 msgstr ""
 
-#: src/exporthtml.c:772 src/importldif.c:964
+#: src/exporthtml.c:768 src/importldif.c:966
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr ""
 
-#: src/exporthtml.c:975
+#: src/exporthtml.c:971
 msgid "Claws Mail Address Book"
 msgstr ""
 
-#: src/exporthtml.c:1070 src/exportldif.c:607
+#: src/exporthtml.c:1066 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr ""
 
-#: src/exporthtml.c:1073 src/exportldif.c:610
+#: src/exporthtml.c:1069 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr ""
 
-#: src/exporthtml.c:1076 src/exportldif.c:613
+#: src/exporthtml.c:1072 src/exportldif.c:613
 msgid "Name is too long."
 msgstr ""
 
-#: src/exporthtml.c:1079 src/exportldif.c:616
+#: src/exporthtml.c:1075 src/exportldif.c:616
 msgid "Not specified."
 msgstr ""
 
@@ -3461,134 +3538,134 @@ msgid ""
 "%s?"
 msgstr ""
 
-#: src/filtering.c:603 src/filtering.c:678 src/filtering.c:707
+#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
 msgid "rule is not account-based\n"
 msgstr ""
 
-#: src/filtering.c:607
+#: src/filtering.c:610
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
 
-#: src/filtering.c:609 src/filtering.c:626 src/filtering.c:627
-#: src/filtering.c:651 src/filtering.c:669 src/filtering.c:696
-#: src/filtering.c:697 src/filtering.c:714 src/filtering.c:715
+#: src/filtering.c:612 src/filtering.c:629 src/filtering.c:630
+#: src/filtering.c:654 src/filtering.c:672 src/filtering.c:699
+#: src/filtering.c:700 src/filtering.c:717 src/filtering.c:718
 msgid "NON_EXISTENT"
 msgstr ""
 
-#: src/filtering.c:617
+#: src/filtering.c:620
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
 
-#: src/filtering.c:624
+#: src/filtering.c:627
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], not matching the account currently "
 "used to retrieve messages [id=%d, name='%s']\n"
 msgstr ""
 
-#: src/filtering.c:643
+#: src/filtering.c:646
 msgid ""
 "rule is not account-based, all rules are applied on user request anyway\n"
 msgstr ""
 
-#: src/filtering.c:649
+#: src/filtering.c:652
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
 "request\n"
 msgstr ""
 
-#: src/filtering.c:667
+#: src/filtering.c:670
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 
-#: src/filtering.c:672
+#: src/filtering.c:675
 msgid "rule is account-based, skipped on user request\n"
 msgstr ""
 
-#: src/filtering.c:694
+#: src/filtering.c:697
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], not matching current account [id="
-"%d, name='%s']\n"
+"rule is account-based [id=%d, name='%s'], not matching current account "
+"[id=%d, name='%s']\n"
 msgstr ""
 
-#: src/filtering.c:700
+#: src/filtering.c:703
 msgid "rule is account-based, not matching current account\n"
 msgstr ""
 
-#: src/filtering.c:712
+#: src/filtering.c:715
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], current account [id=%d, "
 "name='%s']\n"
 msgstr ""
 
-#: src/filtering.c:752
+#: src/filtering.c:755
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:757
+#: src/filtering.c:760
 msgid "action could not apply\n"
 msgstr ""
 
-#: src/filtering.c:759
+#: src/filtering.c:762
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:820
+#: src/filtering.c:823
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:824
+#: src/filtering.c:827
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:842
+#: src/filtering.c:845
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:846
+#: src/filtering.c:849
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:884
+#: src/filtering.c:887
 msgid "undetermined"
 msgstr ""
 
-#: src/filtering.c:888
+#: src/filtering.c:891
 msgid "incorporation"
 msgstr ""
 
-#: src/filtering.c:892
+#: src/filtering.c:895
 msgid "manually"
 msgstr ""
 
-#: src/filtering.c:896
+#: src/filtering.c:899
 msgid "folder processing"
 msgstr ""
 
-#: src/filtering.c:900
+#: src/filtering.c:903
 msgid "pre-processing"
 msgstr ""
 
-#: src/filtering.c:904
+#: src/filtering.c:907
 msgid "post-processing"
 msgstr ""
 
-#: src/filtering.c:919
+#: src/filtering.c:922
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3599,404 +3676,408 @@ msgid ""
 "%s%s %s\n"
 msgstr ""
 
-#: src/filtering.c:921 src/filtering.c:930
+#: src/filtering.c:924 src/filtering.c:933
 msgid ": "
 msgstr ""
 
-#: src/filtering.c:928
+#: src/filtering.c:931
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
 
-#: src/folder.c:1595 src/prefs_folder_item.c:317
+#: src/folder.c:1596 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr ""
 
-#: src/folder.c:1599
+#: src/folder.c:1600
 msgid "Sent"
 msgstr ""
 
-#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:320
+#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/prefs_folder_item.c:327
 msgid "Queue"
 msgstr ""
 
-#: src/folder.c:1607 src/prefs_folder_item.c:321
+#: src/folder.c:1608 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:319
+#: src/folder.c:1612 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr ""
 
-#: src/folder.c:2042
+#: src/folder.c:2043
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3294
+#: src/folder.c:3295
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3604
+#: src/folder.c:3613
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4466
+#: src/folder.c:4478
 msgid "Processing messages..."
 msgstr ""
 
-#: src/folder.c:4601
+#: src/folder.c:4613
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr ""
 
-#: src/folder.c:4860
+#: src/folder.c:4872
 msgid "A folder name cannot begin or end with a dot."
 msgstr ""
 
-#: src/folder.c:4864
+#: src/folder.c:4876
 msgid "A folder name can not end with a space."
 msgstr ""
 
-#: src/foldersel.c:251
+#: src/foldersel.c:252
 msgid "Select folder"
 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
+#: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:131
 msgid "NewFolder"
 msgstr ""
 
-#: src/foldersel.c:574 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:573 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:255 src/plugins/mailmbox/plugin_gtk.c:431
-#: src/plugins/rssyl/rssyl_cb_menu.c:202
-#: src/plugins/vcalendar/vcal_folder.c:2074
+#: src/foldersel.c:583 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:263 src/news_gtk.c:302
+#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:434
+#: src/plugins/rssyl/rssyl_cb_menu.c:240
+#: src/plugins/vcalendar/vcal_folder.c:2104
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
-#: 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:2081
+#: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/mh_gtk.c:273 src/news_gtk.c:309 src/plugins/mailmbox/plugin_gtk.c:270
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:252
+#: src/plugins/vcalendar/vcal_folder.c:2111
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
-#: src/foldersel.c:606 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:605 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
+#: src/plugins/rssyl/rssyl_cb_menu.c:162
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 
-#: src/folderview.c:247
+#: src/folderview.c:248
 msgid "Mark all re_ad"
 msgstr ""
 
-#: src/folderview.c:248
+#: src/folderview.c:249
 msgid "Mark all u_nread"
 msgstr ""
 
-#: src/folderview.c:249
+#: src/folderview.c:250
 msgid "Mark all read recursi_vely"
 msgstr ""
 
-#: src/folderview.c:250
+#: src/folderview.c:251
 msgid "Mark all unread recursi_vely"
 msgstr ""
 
-#: src/folderview.c:252
+#: src/folderview.c:253
 msgid "R_un processing rules"
 msgstr ""
 
-#: src/folderview.c:253 src/mainwindow.c:556
+#: src/folderview.c:254 src/mainwindow.c:557
 msgid "_Search folder..."
 msgstr ""
 
-#: src/folderview.c:255
+#: src/folderview.c:256
 msgid "Process_ing..."
 msgstr ""
 
-#: src/folderview.c:256
+#: src/folderview.c:257
 msgid "Empty _trash..."
 msgstr "Empty was_tebin..."
 
-#: src/folderview.c:257
+#: src/folderview.c:258
 msgid "Send _queue..."
 msgstr ""
 
-#: src/folderview.c:264
+#: src/folderview.c:265
 msgid "Set Displayed columns"
 msgstr ""
 
-#: src/folderview.c:403 src/folderview.c:450
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6523
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
 msgid "New"
 msgstr ""
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:405 src/folderview.c:452
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6525
-#: src/toolbar.c:512
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
+#: src/toolbar.c:522
 msgid "Unread"
 msgstr ""
 
-#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:453 src/summaryview.c:468
+#: src/folderview.c:454 src/summaryview.c:469
 msgid "#"
 msgstr "No."
 
-#: src/folderview.c:784
+#: src/folderview.c:785
 msgid "Setting folder info..."
 msgstr ""
 
-#: src/folderview.c:869 src/summaryview.c:4267
+#: src/folderview.c:870 src/summaryview.c:4272
 msgid "Mark all as read"
 msgstr ""
 
-#: src/folderview.c:870
+#: src/folderview.c:871
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr ""
 
-#: src/folderview.c:872 src/summaryview.c:4268
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 
-#: src/folderview.c:875 src/summaryview.c:4313
+#: src/folderview.c:876 src/summaryview.c:4318
 msgid "Mark all as unread"
 msgstr ""
 
-#: src/folderview.c:876
+#: src/folderview.c:877
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
 msgstr ""
 
-#: src/folderview.c:878 src/summaryview.c:4314
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 
-#: src/folderview.c:1068 src/imap.c:4691
+#: src/folderview.c:1075 src/imap.c:4693
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr ""
 
-#: src/folderview.c:1071 src/imap.c:4695 src/mainwindow.c:5232 src/setup.c:96
+#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr ""
 
-#: src/folderview.c:1102
+#: src/folderview.c:1109
 msgid "Rebuild folder tree"
 msgstr ""
 
-#: src/folderview.c:1103
+#: src/folderview.c:1110
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
-#: src/folderview.c:1113
+#: src/folderview.c:1120
 msgid "Rebuilding folder tree..."
 msgstr ""
 
-#: src/folderview.c:1115
+#: src/folderview.c:1122
 msgid "Scanning folder tree..."
 msgstr ""
 
-#: src/folderview.c:1205
+#: src/folderview.c:1212
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
-#: src/folderview.c:1259
+#: src/folderview.c:1266
 msgid "Checking for new messages in all folders..."
 msgstr ""
 
-#: src/folderview.c:2228
+#: src/folderview.c:2235
 #, c-format
 msgid "Closing folder %s..."
 msgstr ""
 
-#: src/folderview.c:2330
+#: src/folderview.c:2337
 #, c-format
 msgid "Opening folder %s..."
 msgstr ""
 
-#: src/folderview.c:2348
+#: src/folderview.c:2355
 msgid "Folder could not be opened."
 msgstr ""
 
-#: src/folderview.c:2488 src/mainwindow.c:2875 src/mainwindow.c:2880
+#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
 msgid "Empty trash"
 msgstr "Empty wastebin"
 
-#: src/folderview.c:2489
+#: src/folderview.c:2496
 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 
-#: src/folderview.c:2490
+#: src/folderview.c:2497
 msgid "_Empty trash"
 msgstr "_Empty wastebin"
 
-#: src/folderview.c:2534 src/inc.c:1666 src/toolbar.c:3033
+#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
 msgid "Offline warning"
 msgstr ""
 
-#: src/folderview.c:2535 src/toolbar.c:3034
+#: src/folderview.c:2542 src/toolbar.c:3087
 msgid "You're working offline. Override?"
 msgstr ""
 
-#: src/folderview.c:2546 src/toolbar.c:3053
+#: src/folderview.c:2553 src/toolbar.c:3106
 msgid "Send queued messages"
 msgstr ""
 
-#: src/folderview.c:2547 src/toolbar.c:3054
+#: src/folderview.c:2554 src/toolbar.c:3107
 msgid "Send all queued messages?"
 msgstr ""
 
-#: src/folderview.c:2556 src/toolbar.c:3073
+#: src/folderview.c:2563 src/toolbar.c:3126
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
-#: src/folderview.c:2559 src/main.c:2930 src/toolbar.c:3076
+#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
-#: src/folderview.c:2634
+#: src/folderview.c:2647
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr ""
 
-#: src/folderview.c:2635
+#: src/folderview.c:2648
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr ""
 
-#: src/folderview.c:2637
+#: src/folderview.c:2650
 msgid "Copy folder"
 msgstr ""
 
-#: src/folderview.c:2637
+#: src/folderview.c:2650
 msgid "Move folder"
 msgstr ""
 
-#: src/folderview.c:2648
+#: src/folderview.c:2661
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2648
+#: src/folderview.c:2661
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2682
+#: src/folderview.c:2695
 msgid "Source and destination are the same."
 msgstr ""
 
-#: src/folderview.c:2685
+#: src/folderview.c:2698
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2686
+#: src/folderview.c:2699
 msgid "Can't move a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2689
+#: src/folderview.c:2702
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 
-#: src/folderview.c:2692
+#: src/folderview.c:2705
 msgid "Copy failed!"
 msgstr ""
 
-#: src/folderview.c:2692
+#: src/folderview.c:2705
 msgid "Move failed!"
 msgstr ""
 
-#: src/folderview.c:2742
+#: src/folderview.c:2755
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
-#: src/folderview.c:3165 src/summaryview.c:4722 src/summaryview.c:4828
+#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 
-#: src/grouplistdialog.c:161
+#: src/grouplistdialog.c:158
 msgid "Newsgroup subscription"
 msgstr ""
 
-#: src/grouplistdialog.c:178
+#: src/grouplistdialog.c:175
 msgid "Select newsgroups for subscription:"
 msgstr ""
 
-#: src/grouplistdialog.c:192
+#: src/grouplistdialog.c:189
 msgid "Find groups:"
 msgstr ""
 
-#: src/grouplistdialog.c:201
+#: src/grouplistdialog.c:198
 msgid " Search "
 msgstr ""
 
-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:212
 msgid "Newsgroup name"
 msgstr ""
 
-#: src/grouplistdialog.c:216 src/prefs_send.c:188
+#: src/grouplistdialog.c:213 src/prefs_send.c:188
 msgid "Messages"
 msgstr ""
 
-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:214
 msgid "Type"
 msgstr ""
 
-#: src/grouplistdialog.c:357
+#: src/grouplistdialog.c:236
+msgid "_Refresh"
+msgstr ""
+
+#: src/grouplistdialog.c:354
 msgid "moderated"
 msgstr ""
 
-#: src/grouplistdialog.c:359
+#: src/grouplistdialog.c:356
 msgid "read-only"
 msgstr ""
 
-#: src/grouplistdialog.c:361 src/plugins/att_remover/att_remover.c:303
+#: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:302
 #: src/plugins/vcalendar/vcal_manager.c:115
 #: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr ""
 
-#: src/grouplistdialog.c:436
+#: src/grouplistdialog.c:433
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
-#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1845 src/summaryview.c:1670
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
 msgid "Done."
 msgstr ""
 
@@ -4005,152 +4086,152 @@ msgstr ""
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 
-#: src/gtk/about.c:133
+#: src/gtk/about.c:134
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr ""
 
-#: src/gtk/about.c:136
+#: src/gtk/about.c:137
 msgid "For further information visit the Claws Mail website:"
 msgstr ""
 
-#: src/gtk/about.c:141
+#: src/gtk/about.c:142
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 
-#: src/gtk/about.c:147
+#: src/gtk/about.c:148
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
 msgstr ""
 
-#: src/gtk/about.c:163 src/gtk/about.c:857
+#: src/gtk/about.c:164 src/gtk/about.c:862
 msgid ""
-"Copyright (C) 1999-2021\n"
+"Copyright (C) 1999-2022\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:169
 msgid "System Information\n"
 msgstr ""
 
-#: src/gtk/about.c:174
+#: src/gtk/about.c:175
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
 
-#: src/gtk/about.c:183
+#: src/gtk/about.c:185
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
 
-#: src/gtk/about.c:192
+#: src/gtk/about.c:195
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
 
-#: src/gtk/about.c:249 src/prefs_themes.c:846 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr ""
 
-#: src/gtk/about.c:268
+#: src/gtk/about.c:273
 msgid "Previous team members"
 msgstr ""
 
-#: src/gtk/about.c:287
+#: src/gtk/about.c:292
 msgid "The translation team"
 msgstr ""
 
-#: src/gtk/about.c:306
+#: src/gtk/about.c:311
 msgid "Documentation team"
 msgstr ""
 
-#: src/gtk/about.c:324
+#: src/gtk/about.c:329
 msgid "Logo"
 msgstr ""
 
-#: src/gtk/about.c:343
+#: src/gtk/about.c:348
 msgid "Icons"
 msgstr ""
 
-#: src/gtk/about.c:362
+#: src/gtk/about.c:367
 msgid "Contributors"
 msgstr ""
 
-#: src/gtk/about.c:411
+#: src/gtk/about.c:416
 msgid "Compiled-in Features"
 msgstr ""
 
-#: src/gtk/about.c:428
+#: src/gtk/about.c:433
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr ""
 
-#: src/gtk/about.c:438
+#: src/gtk/about.c:443
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr ""
 
-#: src/gtk/about.c:448
+#: src/gtk/about.c:453
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr ""
 
-#: src/gtk/about.c:458
+#: src/gtk/about.c:463
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
 
-#: src/gtk/about.c:469
+#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr ""
 
-#: src/gtk/about.c:479
+#: src/gtk/about.c:484
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:489
+#: src/gtk/about.c:494
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:499
+#: src/gtk/about.c:504
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr ""
 
-#: src/gtk/about.c:509
+#: src/gtk/about.c:514
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr ""
 
-#: src/gtk/about.c:519
+#: src/gtk/about.c:524
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr ""
 
-#: src/gtk/about.c:529
+#: src/gtk/about.c:534
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr ""
 
-#: src/gtk/about.c:562
+#: src/gtk/about.c:567
 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:569
+#: src/gtk/about.c:574
 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 "
@@ -4158,154 +4239,162 @@ msgid ""
 "more details."
 msgstr ""
 
-#: src/gtk/about.c:587
+#: src/gtk/about.c:592
 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:722 src/main.c:2754
+#: src/gtk/about.c:727 src/main.c:2746
 msgid "Session statistics\n"
 msgstr ""
 
-#: src/gtk/about.c:732 src/gtk/about.c:735 src/main.c:2764 src/main.c:2767
+#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
 #, c-format
 msgid "Started: %s\n"
 msgstr ""
 
-#: src/gtk/about.c:742 src/main.c:2773
+#: src/gtk/about.c:747 src/main.c:2765
 msgid "Incoming traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:745 src/main.c:2776
+#: src/gtk/about.c:750 src/main.c:2768
 #, c-format
 msgid "Received messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:752 src/main.c:2782
+#: src/gtk/about.c:757 src/main.c:2774
 msgid "Outgoing traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:755 src/main.c:2785
+#: src/gtk/about.c:760 src/main.c:2777
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:760 src/main.c:2789
+#: src/gtk/about.c:765 src/main.c:2781
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:765 src/main.c:2793
+#: src/gtk/about.c:770 src/main.c:2785
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:770 src/main.c:2797
+#: src/gtk/about.c:775 src/main.c:2789
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:797
+#: src/gtk/about.c:802
 msgid "About Claws Mail"
 msgstr ""
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:877
 msgid "_Info"
 msgstr ""
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:883
 msgid "_Authors"
 msgstr ""
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:889
 msgid "_Features"
 msgstr ""
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:895
 msgid "_License"
 msgstr ""
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:903
 msgid "_Release Notes"
 msgstr ""
 
-#: src/gtk/about.c:904
+#: src/gtk/about.c:909
 msgid "_Statistics"
 msgstr ""
 
-#: src/gtk/colorlabel.c:37 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
 msgid "Orange"
 msgstr ""
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
 msgid "Red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
 msgid "Pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
 msgid "Sky blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
 msgid "Blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
 msgid "Green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
 msgid "Brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
 msgid "Grey"
 msgstr ""
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
 msgid "Light brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
 msgid "Dark red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
 msgid "Dark pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
 msgid "Steel blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
 msgid "Gold"
 msgstr ""
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
 msgid "Bright green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
 msgid "Magenta"
 msgstr ""
 
-#: src/gtk/foldersort.c:229
+#: src/gtk/foldersort.c:230
 msgid "Set mailbox order"
 msgstr ""
 
-#: src/gtk/foldersort.c:265
+#: src/gtk/foldersort.c:266
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 
-#: src/gtk/foldersort.c:299
+#: src/gtk/foldersort.c:300
 msgid "Mailboxes"
 msgstr ""
 
+#: src/gtk/foldersort.c:316
+msgid "Move the selected mailbox up"
+msgstr ""
+
+#: src/gtk/foldersort.c:322
+msgid "Move the selected mailbox down"
+msgstr ""
+
 #: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
 msgid "No dictionary selected."
 msgstr ""
@@ -4328,103 +4417,103 @@ msgstr ""
 msgid "No misspelled word found."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1445
+#: src/gtk/gtkaspell.c:1443
 msgid "Replace unknown word"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1461
+#: src/gtk/gtkaspell.c:1459
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1505
+#: src/gtk/gtkaspell.c:1504
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1806 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1801 src/gtk/gtkaspell.c:1938
 msgid "More..."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1862
+#: src/gtk/gtkaspell.c:1857
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1872
 msgid "Accept in this session"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1882
 msgid "Add to personal dictionary"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1892
 msgid "Replace with..."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1905
 #, c-format
 msgid "Check with %s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1927
 msgid "(no suggestions)"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2001
 #, c-format
 msgid "Dictionary: %s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2020
+#: src/gtk/gtkaspell.c:2015
 #, c-format
 msgid "Use alternate (%s)"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2031
+#: src/gtk/gtkaspell.c:2026
 msgid "Use both dictionaries"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2047 src/prefs_spelling.c:131
+#: src/gtk/gtkaspell.c:2042 src/prefs_spelling.c:130
 msgid "Check while typing"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2129
+#: src/gtk/gtkaspell.c:2124
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2185
+#: src/gtk/gtkaspell.c:2180
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
 "%s"
 msgstr ""
 
-#: src/gtk/gtkutils.c:1850
+#: src/gtk/gtkutils.c:1743
 msgid "Failed: no service record found."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1853
+#: src/gtk/gtkutils.c:1746
 msgid "Failed: network error."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1856
+#: src/gtk/gtkutils.c:1749
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1926
+#: src/gtk/gtkutils.c:1819
 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
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr ""
 
@@ -4432,10 +4521,10 @@ msgstr ""
 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
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2215
+#: src/prefs_summaries.c:638 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/summaryview.c:465
 msgid "From"
 msgstr ""
 
@@ -4455,15 +4544,15 @@ msgstr ""
 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
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2216
+#: src/prefs_summaries.c:639 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/summaryview.c:466
 msgid "To"
 msgstr ""
 
 #: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
-#: src/prefs_matcher.c:2211 src/quote_fmt.c:57
+#: src/prefs_matcher.c:2217 src/quote_fmt.c:57
 msgid "Cc"
 msgstr ""
 
@@ -4472,7 +4561,7 @@ msgid "Bcc"
 msgstr ""
 
 #: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
-#: src/prefs_matcher.c:2213 src/quote_fmt.c:60
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:60
 msgid "Message-ID"
 msgstr ""
 
@@ -4485,7 +4574,7 @@ 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
+#: src/prefs_matcher.c:2221 src/quote_fmt.c:59
 msgid "References"
 msgstr ""
 
@@ -4493,10 +4582,10 @@ msgstr ""
 msgid "References:"
 msgstr ""
 
-#: 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
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2214
+#: src/prefs_summaries.c:640 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/summaryview.c:464
 msgid "Subject"
 msgstr ""
 
@@ -4505,7 +4594,7 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
 msgid "Comments"
 msgstr ""
 
@@ -4594,7 +4683,7 @@ msgid "Received:"
 msgstr ""
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
-#: src/prefs_matcher.c:2214 src/quote_fmt.c:58
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr ""
 
@@ -4618,10 +4707,10 @@ msgstr ""
 msgid "Seen:"
 msgstr ""
 
-#: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:642
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1035 src/ssl_manager.c:124
-#: src/summaryview.c:2889
+#: src/gtk/headers.h:37 src/gtk/progressdialog.c:147
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:644
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1130 src/ssl_manager.c:124
+#: src/summaryview.c:2894
 msgid "Status"
 msgstr ""
 
@@ -4665,7 +4754,7 @@ msgstr ""
 msgid "Content-Type"
 msgstr ""
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:338
 msgid "Content-Type:"
 msgstr ""
 
@@ -4699,7 +4788,7 @@ msgstr "Organisation"
 
 #: src/gtk/headers.h:46
 msgid "Organization:"
-msgstr "Organisation: "
+msgstr "Organisation:"
 
 #: src/gtk/headers.h:48
 msgid "Mailing-List"
@@ -4946,7 +5035,7 @@ msgstr ""
 msgid "Remember password for this session"
 msgstr ""
 
-#: src/gtk/inputdialog.c:364 src/gtk/inputdialog.c:411
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:406
 msgid "Remember this"
 msgstr ""
 
@@ -4996,32 +5085,33 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:776
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:775
 #: src/plugins/address_keeper/address_keeper_prefs.c:280
-#: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
+#: src/plugins/archive/archiver_prefs.c:105
+#: src/plugins/attachwarner/attachwarner_prefs.c:234
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
-#: src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: 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:141
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:234
 #: 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: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/notification/notification_prefs.c:401
+#: src/plugins/notification/notification_prefs.c:417
+#: src/plugins/notification/notification_prefs.c:436
+#: src/plugins/notification/notification_prefs.c:454
+#: src/plugins/notification/notification_prefs.c:472
+#: src/plugins/notification/notification_prefs.c:490
+#: src/plugins/notification/notification_prefs.c:508
+#: src/plugins/notification/notification_prefs.c:526
 #: 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:665
-#: src/plugins/vcalendar/vcal_prefs.c:773 src/prefs_toolbar.c:923
+#: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr ""
 
@@ -5033,7 +5123,7 @@ msgstr ""
 msgid "_Unload"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
 msgid "Description"
 msgstr ""
 
@@ -5054,26 +5144,26 @@ msgstr ""
 msgid "Loaded plugins"
 msgstr ""
 
-#: src/gtk/prefswindow.c:504 src/gtk/prefswindow.c:509
-#: src/plugins/archive/archiver_gtk.c:946
+#: src/gtk/prefswindow.c:506 src/gtk/prefswindow.c:511
+#: src/plugins/archive/archiver_gtk.c:945
 #: src/plugins/clamd/clamav_plugin_gtk.c:92
 msgid "_Apply"
 msgstr ""
 
-#: src/gtk/prefswindow.c:645
+#: src/gtk/prefswindow.c:647
 msgid "Page Index"
 msgstr ""
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:847
+#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
 msgid "_Hide"
 msgstr ""
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:4036 src/prefs_account.c:4054 src/prefs_account.c:4072
-#: src/prefs_account.c:4090 src/prefs_account.c:4108 src/prefs_account.c:4126
-#: src/prefs_account.c:4144 src/prefs_account.c:4163 src/prefs_account.c:4256
-#: src/prefs_account.c:4274 src/prefs_filtering_action.c:1380
-#: src/prefs_filtering.c:395 src/prefs_filtering.c:1863
+#: src/gtk/progressdialog.c:139 src/plugins/managesieve/sieve_manager.c:694
+#: src/prefs_account.c:4043 src/prefs_account.c:4061 src/prefs_account.c:4079
+#: src/prefs_account.c:4097 src/prefs_account.c:4115 src/prefs_account.c:4133
+#: src/prefs_account.c:4151 src/prefs_account.c:4170 src/prefs_account.c:4253
+#: src/prefs_account.c:4271 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:395 src/prefs_filtering.c:1871
 msgid "Account"
 msgstr ""
 
@@ -5291,69 +5381,69 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: src/gtk/quicksearch.c:587
+#: src/gtk/quicksearch.c:588
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 
-#: src/gtk/quicksearch.c:871
+#: src/gtk/quicksearch.c:872
 msgid "From/To/Cc/Subject/Tag"
 msgstr ""
 
-#: src/gtk/quicksearch.c:889 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr ""
 
-#: src/gtk/quicksearch.c:895
+#: src/gtk/quicksearch.c:896
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/quicksearch.c:901
+#: src/gtk/quicksearch.c:902
 msgid "Type-ahead"
 msgstr ""
 
-#: src/gtk/quicksearch.c:907
+#: src/gtk/quicksearch.c:908
 msgid "Run on select"
 msgstr ""
 
-#: src/gtk/quicksearch.c:928 src/gtk/quicksearch.c:993
-#: src/gtk/quicksearch.c:1022 src/plugins/libravatar/libravatar_prefs.c:252
-#: src/prefs_actions.c:345 src/prefs_filtering.c:479 src/prefs_template.c:324
+#: src/gtk/quicksearch.c:929 src/gtk/quicksearch.c:994
+#: src/gtk/quicksearch.c:1023 src/plugins/libravatar/libravatar_prefs.c:252
+#: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:324
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr ""
 
-#: src/gtk/quicksearch.c:934
+#: src/gtk/quicksearch.c:935
 msgid "Clear the current search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:944 src/summary_search.c:421
+#: src/gtk/quicksearch.c:945 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr ""
 
-#: src/gtk/quicksearch.c:947 src/gtk/quicksearch.c:991
-#: src/gtk/quicksearch.c:1020 src/prefs_actions.c:353
+#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
+#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:494 src/prefs_template.c:332 src/quote_fmt.c:526
+#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
 #: src/ssl_manager.c:216
 msgid "_Information"
 msgstr ""
 
-#: src/gtk/quicksearch.c:953
+#: src/gtk/quicksearch.c:954
 msgid "Information about extended symbols"
 msgstr ""
 
-#: src/gtk/quicksearch.c:992 src/gtk/quicksearch.c:1021
-#: src/gtk/quicksearch.c:1027
+#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
+#: src/gtk/quicksearch.c:1028
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:302
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:304
 #, c-format
 msgid "Correct%s"
 msgstr ""
 
 #: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
-#: src/ssl_manager.c:302 src/ssl_manager.c:306
+#: src/ssl_manager.c:304 src/ssl_manager.c:308
 msgid " (expired)"
 msgstr ""
 
@@ -5497,33 +5587,33 @@ msgstr ""
 
 #: src/headerview.c:193 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3489
-#: src/summaryview.c:3507 src/summaryview.c:3546
+#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3494
+#: src/summaryview.c:3512 src/summaryview.c:3551
 msgid "(No From)"
 msgstr ""
 
 #: src/headerview.c:208 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3558
-#: src/summaryview.c:3561
+#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3563
+#: src/summaryview.c:3566
 msgid "(No Subject)"
 msgstr ""
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:100
 msgid "Error:"
 msgstr ""
 
-#: src/image_viewer.c:316 src/mimeview.c:2677
-#: src/plugins/att_remover/att_remover.c:307
+#: src/image_viewer.c:314 src/mimeview.c:2586
+#: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr ""
 
-#: src/image_viewer.c:321
+#: src/image_viewer.c:319
 msgid "Filesize:"
 msgstr ""
 
-#: src/image_viewer.c:366
+#: src/image_viewer.c:364
 msgid "Load Image"
 msgstr ""
 
@@ -5780,16 +5870,16 @@ msgstr ""
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1066 src/imap.c:3741 src/imap.c:4400 src/imap.c:4494
-#: src/imap.c:4672 src/imap.c:5483
+#: src/imap.c:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
+#: src/imap.c:4674 src/imap.c:5485
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
-#: src/imap.c:1176 src/inc.c:881 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr ""
 
-#: src/imap.c:1177 src/inc.c:882 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -5798,7 +5888,7 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1183 src/inc.c:888 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr ""
 
@@ -5817,7 +5907,7 @@ msgstr ""
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1292 src/imap.c:4162
+#: src/imap.c:1292 src/imap.c:4164
 msgid "Can't start STARTTLS session.\n"
 msgstr ""
 
@@ -5847,7 +5937,7 @@ msgstr ""
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2617 src/imap.c:5113
+#: src/imap.c:2617 src/imap.c:5115
 msgid "can't expunge\n"
 msgstr ""
 
@@ -5861,65 +5951,65 @@ msgstr ""
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3283
+#: src/imap.c:3286
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3296
+#: src/imap.c:3299
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3427
+#: src/imap.c:3429
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3540
+#: src/imap.c:3542
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3819
+#: src/imap.c:3821
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3904
+#: src/imap.c:3906
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:4007
+#: src/imap.c:4009
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4159
+#: src/imap.c:4161
 msgid "Server requires STARTTLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4169
+#: src/imap.c:4171
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4174
+#: src/imap.c:4176
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
 msgstr ""
 
-#: src/imap.c:4182
+#: src/imap.c:4184
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4405
+#: src/imap.c:4407
 msgid "Fetching message..."
 msgstr ""
 
-#: src/imap.c:5106
+#: src/imap.c:5108
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:6141
+#: src/imap.c:6143
 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"
@@ -5993,84 +6083,85 @@ msgid ""
 "only and no mail, append '/' to the folder name)"
 msgstr ""
 
-#: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:196
-#: src/plugins/vcalendar/vcal_folder.c:2066
+#: src/imap_gtk.c:259 src/mh_gtk.c:253 src/news_gtk.c:293
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:234
+#: src/plugins/vcalendar/vcal_folder.c:2096
 #, 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:421
-#: src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2067
+#: src/imap_gtk.c:261 src/mh_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:424
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2097
 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:451 src/plugins/rssyl/rssyl_cb_menu.c:220
-#: src/plugins/vcalendar/vcal_folder.c:2087
+#: src/imap_gtk.c:290 src/mh_gtk.c:281 src/news_gtk.c:315
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:258
+#: src/plugins/vcalendar/vcal_folder.c:2117
 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:373
+#: src/imap_gtk.c:317 src/mh_gtk.c:308 src/plugins/mailmbox/plugin_gtk.c:376
 #, 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:393
+#: src/imap_gtk.c:337 src/mh_gtk.c:328 src/plugins/mailmbox/plugin_gtk.c:396
 #, c-format
 msgid "Select folder to copy folder '%s' to"
 msgstr ""
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/mailmbox/plugin_gtk.c:332
+#: src/plugins/rssyl/rssyl_cb_menu.c:190
 #, c-format
 msgid ""
-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
+"Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
 
-#: 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:2020
+#: src/imap_gtk.c:385 src/news_gtk.c:268 src/plugins/mailmbox/plugin_gtk.c:351
+#: src/plugins/rssyl/rssyl_cb_menu.c:210
+#: src/plugins/vcalendar/vcal_folder.c:2050
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 
-#: src/imap_gtk.c:506
+#: src/imap_gtk.c:507
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr ""
 
-#: src/imap_gtk.c:509
+#: src/imap_gtk.c:510
 msgid "Search recursively"
 msgstr ""
 
-#: src/imap_gtk.c:514 src/imap_gtk.c:573
+#: src/imap_gtk.c:515 src/imap_gtk.c:575
 msgid "Subscriptions"
 msgstr ""
 
-#: src/imap_gtk.c:515
+#: src/imap_gtk.c:516
 msgid "_Search"
 msgstr ""
 
-#: src/imap_gtk.c:525
+#: src/imap_gtk.c:527
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: src/imap_gtk.c:536 src/mainwindow.c:683
+#: src/imap_gtk.c:538 src/mainwindow.c:684
 msgid "Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:538 src/imap_gtk.c:540
+#: src/imap_gtk.c:540 src/imap_gtk.c:542
 msgid "All of them"
 msgstr ""
 
-#: src/imap_gtk.c:556
+#: src/imap_gtk.c:558
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -6078,33 +6169,33 @@ msgid ""
 "\"Check for new folders\" at the mailbox's root folder."
 msgstr ""
 
-#: src/imap_gtk.c:565
+#: src/imap_gtk.c:567
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr ""
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:568
 msgid "unsubscribe"
 msgstr ""
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1514 src/prefs_folder_item.c:1542
-#: src/prefs_folder_item.c:1570
+#: src/imap_gtk.c:570 src/prefs_folder_item.c:1590 src/prefs_folder_item.c:1618
+#: src/prefs_folder_item.c:1646
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/imap_gtk.c:574
+#: src/imap_gtk.c:576
 msgid "_Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:574 src/news_gtk.c:252
+#: src/imap_gtk.c:576 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr ""
 
-#: src/import.c:112 src/import.c:203
+#: src/import.c:112 src/import.c:206
 msgid "Import mbox file"
 msgstr ""
 
@@ -6116,29 +6207,29 @@ msgstr ""
 msgid "Destination folder:"
 msgstr ""
 
-#: src/import.c:198
+#: src/import.c:201
 msgid "Source mbox filename can't be left empty."
 msgstr ""
 
-#: src/import.c:203
+#: src/import.c:207
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
 msgstr ""
 
-#: src/import.c:225
+#: src/import.c:228
 msgid "Can't find the destination folder."
 msgstr ""
 
-#: src/import.c:230
+#: src/import.c:233
 msgid "Importing mbox file..."
 msgstr ""
 
-#: src/import.c:252
+#: src/import.c:255
 msgid "Select importing file"
 msgstr ""
 
-#: src/import.c:270
+#: src/import.c:273
 msgid "Select folder to import to"
 msgstr ""
 
@@ -6166,53 +6257,53 @@ msgstr ""
 msgid "LDIF file imported successfully."
 msgstr ""
 
-#: src/importldif.c:465
+#: src/importldif.c:467
 msgid "Select LDIF File"
 msgstr ""
 
-#: src/importldif.c:549
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr ""
 
-#: src/importldif.c:553
+#: src/importldif.c:555
 msgid "File Name"
 msgstr ""
 
-#: src/importldif.c:563
+#: src/importldif.c:565
 msgid "The full file specification of the LDIF file to import."
 msgstr ""
 
-#: src/importldif.c:569
+#: src/importldif.c:571
 msgid "Select the LDIF file to import."
 msgstr ""
 
-#: src/importldif.c:700
+#: src/importldif.c:702
 msgid "R"
 msgstr ""
 
-#: src/importldif.c:705 src/summaryview.c:461
+#: src/importldif.c:707 src/summaryview.c:462
 msgid "S"
 msgstr ""
 
-#: src/importldif.c:711
+#: src/importldif.c:713
 msgid "LDIF Field Name"
 msgstr ""
 
-#: src/importldif.c:716
+#: src/importldif.c:718
 msgid "Attribute Name"
 msgstr ""
 
-#: src/importldif.c:734
+#: src/importldif.c:736
 msgid "LDIF Field"
 msgstr ""
 
-#: src/importldif.c:745
+#: src/importldif.c:747
 msgid "Attribute"
 msgstr ""
 
-#: src/importldif.c:756
+#: src/importldif.c:758
 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 "
@@ -6223,35 +6314,35 @@ msgid ""
 "field for import."
 msgstr ""
 
-#: src/importldif.c:772
+#: src/importldif.c:774
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
 
-#: src/importldif.c:775
+#: src/importldif.c:777
 msgid "Select for Import"
 msgstr ""
 
-#: src/importldif.c:779
+#: src/importldif.c:781
 msgid "Select the LDIF field for import into the address book."
 msgstr ""
 
-#: src/importldif.c:781
+#: src/importldif.c:783
 msgid " Modify "
 msgstr ""
 
-#: src/importldif.c:785
+#: src/importldif.c:787
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 
-#: src/importldif.c:855
+#: src/importldif.c:857
 msgid "Records Imported:"
 msgstr ""
 
-#: src/importldif.c:887
+#: src/importldif.c:889
 msgid "Import LDIF file into Address Book"
 msgstr ""
 
-#: src/importldif.c:925
+#: src/importldif.c:927
 msgid "Proceed"
 msgstr ""
 
@@ -6323,12 +6414,12 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr ""
 
-#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:645
-#: src/prefs_summary_column.c:87 src/summaryview.c:2885 src/summaryview.c:6549
+#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:647
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6561
 msgid "Locked"
 msgstr ""
 
@@ -6347,178 +6438,178 @@ msgstr[1] ""
 msgid "Finished (no new messages)"
 msgstr ""
 
-#: src/inc.c:865
+#: src/inc.c:867
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:894
+#: src/inc.c:896
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr ""
 
-#: src/inc.c:928
+#: src/inc.c:930
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
-#: src/inc.c:932
+#: src/inc.c:934
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
-#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
 #: src/send_message.c:519
 msgid "Authenticating..."
 msgstr ""
 
-#: src/inc.c:1014
+#: src/inc.c:1016
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr ""
 
-#: src/inc.c:1020
+#: src/inc.c:1022
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
-#: src/inc.c:1024
+#: src/inc.c:1026
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
-#: src/inc.c:1028
+#: src/inc.c:1030
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
-#: src/inc.c:1032
+#: src/inc.c:1034
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:1039 src/send_message.c:537
+#: src/inc.c:1041 src/send_message.c:537
 msgid "Quitting"
 msgstr ""
 
-#: src/inc.c:1064
+#: src/inc.c:1066
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
-#: src/inc.c:1077
+#: src/inc.c:1079
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1232
+#: src/inc.c:1234
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
-#: src/inc.c:1237
+#: src/inc.c:1239
 msgid "Error occurred while processing mail."
 msgstr ""
 
-#: src/inc.c:1243
+#: src/inc.c:1245
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1249
+#: src/inc.c:1251
 msgid "No disk space left."
 msgstr ""
 
-#: src/inc.c:1254
+#: src/inc.c:1256
 msgid "Can't write file."
 msgstr ""
 
-#: src/inc.c:1259
+#: src/inc.c:1261
 msgid "Socket error."
 msgstr ""
 
-#: src/inc.c:1262
+#: src/inc.c:1264
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1270
+#: src/inc.c:1272
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1275
+#: src/inc.c:1277
 msgid "Mailbox is locked."
 msgstr ""
 
-#: src/inc.c:1279
+#: src/inc.c:1281
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1285 src/send_message.c:696
+#: src/inc.c:1287 src/send_message.c:696
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1291 src/send_message.c:699
+#: src/inc.c:1293 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1296 src/send_message.c:715
+#: src/inc.c:1298 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:1301
+#: src/inc.c:1303
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1339
+#: src/inc.c:1341
 msgid "Incorporation cancelled\n"
 msgstr ""
 
-#: 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/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: src/plugins/notification/notification_prefs.c:1355
+#: src/plugins/notification/notification_prefs.c:1661
 #: 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
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:553
 msgid "seconds"
 msgstr ""
 
-#: src/inc.c:1641 src/inc.c:1651
+#: src/inc.c:1646 src/inc.c:1656
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1644
+#: src/inc.c:1649
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1656
+#: src/inc.c:1661
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr ""
 
-#: src/inc.c:1662
+#: src/inc.c:1667
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 
-#: src/inc.c:1669
+#: src/inc.c:1674
 msgid "On_ly once"
 msgstr ""
 
@@ -6527,8 +6618,8 @@ msgstr ""
 msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
 msgstr ""
 
-#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
-#: src/ldapupdate.c:1330
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1290
+#: src/ldapupdate.c:1331
 #, c-format
 msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
 msgstr ""
@@ -6551,25 +6642,25 @@ msgstr ""
 msgid "LDAP error (search): %d (%s)\n"
 msgstr ""
 
-#: src/ldif.c:759
+#: src/ldif.c:763
 msgid "Nick Name"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:253
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 
-#: src/main.c:381
+#: src/main.c:383
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 
-#: src/main.c:383
+#: src/main.c:387
 #, c-format
 msgid ""
 "\n"
@@ -6578,42 +6669,38 @@ msgid ""
 "script available at %s."
 msgstr ""
 
-#: src/main.c:395
+#: src/main.c:400
 msgid "Keep old configuration"
 msgstr ""
 
-#: src/main.c:398
+#: src/main.c:403
 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:406
+#: src/main.c:411
 msgid "Migration of configuration"
 msgstr ""
 
-#: src/main.c:417
+#: src/main.c:422
 msgid "Copying configuration... This may take a while..."
 msgstr ""
 
-#: src/main.c:426
+#: src/main.c:431
 msgid "Migration failed!"
 msgstr ""
 
-#: src/main.c:435
+#: src/main.c:440
 msgid "Migrating configuration..."
 msgstr ""
 
-#: src/main.c:1184
-msgid "g_thread is not supported by glib.\n"
-msgstr ""
-
-#: src/main.c:1204 src/main.c:1208 src/main.c:1212
+#: src/main.c:1194 src/main.c:1198 src/main.c:1202
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1550
+#: src/main.c:1540
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6626,90 +6713,90 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.c:1592
+#: src/main.c:1582
 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:1598
+#: src/main.c:1588
 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:1839
+#: src/main.c:1828
 msgid "Missing filename\n"
 msgstr ""
 
-#: src/main.c:1846
+#: src/main.c:1835
 msgid "Cannot open filename for reading\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1846
 msgid "Malformed header\n"
 msgstr ""
 
-#: src/main.c:1864
+#: src/main.c:1853
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1875
+#: src/main.c:1864
 msgid "Missing required 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1901
+#: src/main.c:1888
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr ""
 
-#: src/main.c:1928 src/main.c:1991
+#: src/main.c:1917 src/main.c:1980
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:1939
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr ""
 
-#: src/main.c:1953
+#: src/main.c:1942
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr ""
 
-#: src/main.c:1986
+#: src/main.c:1975
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2044
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr ""
 
-#: src/main.c:2058
+#: src/main.c:2047
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr ""
 
-#: src/main.c:2061
+#: src/main.c:2050
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr ""
 
-#: src/main.c:2077
+#: src/main.c:2066
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2068
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:2080
+#: src/main.c:2069
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6720,41 +6807,41 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2074
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 
-#: src/main.c:2086
+#: src/main.c:2075
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:2089
+#: src/main.c:2078
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         inserted"
 msgstr ""
 
-#: src/main.c:2092
+#: src/main.c:2081
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:2093
+#: src/main.c:2082
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:2094
+#: src/main.c:2083
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr ""
 
-#: src/main.c:2095
+#: src/main.c:2084
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr ""
 
-#: src/main.c:2096
+#: src/main.c:2085
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6765,947 +6852,952 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:2103
+#: src/main.c:2092
 msgid "  --send                 send all queued messages"
 msgstr ""
 
-#: src/main.c:2104
+#: src/main.c:2093
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
-#: src/main.c:2105
+#: src/main.c:2094
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
-#: src/main.c:2107
+#: src/main.c:2096
 msgid "  --statistics           show session statistics"
 msgstr ""
 
-#: src/main.c:2108
+#: src/main.c:2097
 msgid "  --reset-statistics     reset session statistics"
 msgstr ""
 
-#: src/main.c:2109
+#: src/main.c:2098
 msgid ""
 "  --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:2111
+#: src/main.c:2100
 msgid "  --online               switch to online mode"
 msgstr ""
 
-#: src/main.c:2112
+#: src/main.c:2101
 msgid "  --offline              switch to offline mode"
 msgstr ""
 
-#: src/main.c:2113
+#: src/main.c:2102
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr ""
 
-#: src/main.c:2114
+#: src/main.c:2103
 msgid "  --debug -d             debug mode"
 msgstr ""
 
-#: src/main.c:2115
+#: src/main.c:2104
 msgid "  --toggle-debug         toggle debug mode"
 msgstr ""
 
-#: src/main.c:2116
+#: src/main.c:2105
 msgid "  --help -h              display this help"
 msgstr ""
 
-#: src/main.c:2117
+#: src/main.c:2106
 msgid "  --version -v           output version information"
 msgstr ""
 
-#: src/main.c:2118
+#: src/main.c:2107
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 
-#: src/main.c:2119
+#: src/main.c:2108
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
-#: src/main.c:2120
+#: src/main.c:2109
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
 
-#: src/main.c:2122
+#: src/main.c:2111
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
 
-#: src/main.c:2139
+#: src/main.c:2128
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr ""
 
-#: src/main.c:2147
+#: src/main.c:2136
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr ""
 
-#: src/main.c:2158
+#: src/main.c:2147
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr ""
 
-#: src/main.c:2191 src/main.c:2194
+#: src/main.c:2180 src/main.c:2183
 #, c-format
 msgid "Unknown option %s"
 msgstr ""
 
-#: src/main.c:2210
+#: src/main.c:2199
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
-#: src/main.c:2213
+#: src/main.c:2202
 msgid "top level folder"
 msgstr ""
 
-#: src/main.c:2295
+#: src/main.c:2284
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:2296
+#: src/main.c:2285
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
-#: src/main.c:3058
+#: src/main.c:3052
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:3064
+#: src/main.c:3058
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
-#: src/mainwindow.c:516 src/messageview.c:211
+#: src/mainwindow.c:517 src/messageview.c:212
 msgid "_File"
 msgstr ""
 
-#: src/mainwindow.c:518 src/messageview.c:213 src/summaryview.c:442
+#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr ""
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:522
 msgid "_Configuration"
 msgstr ""
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:526
 msgid "_Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:527
 msgid "MH..."
 msgstr ""
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:530
 msgid "Change mailbox order..."
 msgstr ""
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:533
 msgid "_Import mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:534
 msgid "_Export to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:535
 msgid "_Export selected to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:537
 msgid "Empty all _Trash folders"
 msgstr "Empty all Was_tebin folders"
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:540 src/messageview.c:221
 msgid "_Save email as..."
 msgstr ""
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:541 src/messageview.c:222
 msgid "_Save part as..."
 msgstr ""
 
-#: src/mainwindow.c:543 src/messageview.c:222
+#: src/mainwindow.c:544 src/messageview.c:223
 msgid "Page setup..."
 msgstr ""
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:545 src/messageview.c:224
 msgid "_Print..."
 msgstr ""
 
-#: src/mainwindow.c:546
+#: src/mainwindow.c:547
 msgid "Synchronise folders"
 msgstr ""
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:549
 msgid "E_xit"
 msgstr ""
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:554
 msgid "Select _thread"
 msgstr ""
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:556
 msgid "_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:558
 msgid "_Quick search"
 msgstr ""
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:561
 msgid "Show or hi_de"
 msgstr ""
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:562
 msgid "_Toolbar"
 msgstr ""
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:564
 msgid "Set displayed _columns"
 msgstr ""
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:565
 msgid "In _folder list..."
 msgstr ""
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:566
 msgid "In _message list..."
 msgstr ""
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:571
 msgid "La_yout"
 msgstr ""
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:573
 msgid "_Sort"
 msgstr ""
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:575
 msgid "_Attract by subject"
 msgstr ""
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:577
 msgid "E_xpand all threads"
 msgstr ""
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:578
 msgid "Co_llapse all threads"
 msgstr ""
 
-#: src/mainwindow.c:579 src/messageview.c:234
+#: src/mainwindow.c:580 src/messageview.c:235
 msgid "_Go to"
 msgstr ""
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:581 src/messageview.c:236
 msgid "_Previous message"
 msgstr ""
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:582 src/messageview.c:237
 msgid "_Next message"
 msgstr ""
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:584 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr ""
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:585 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr ""
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:587 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr ""
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:588 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr ""
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:590 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr ""
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:591 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr ""
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:593 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Previous _labelled message"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:594 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Next la_belled message"
 
-#: src/mainwindow.c:595 src/messageview.c:250
-msgid "Previous opened message"
+#: src/mainwindow.c:596
+msgid "Previously opened message"
 msgstr ""
 
-#: src/mainwindow.c:596 src/messageview.c:251
+#: src/mainwindow.c:597 src/messageview.c:252
 msgid "Next opened message"
 msgstr ""
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:599 src/messageview.c:254
 msgid "Parent message"
 msgstr ""
 
-#: src/mainwindow.c:600 src/messageview.c:255
+#: src/mainwindow.c:601 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr ""
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:602 src/messageview.c:257
 msgid "F_older..."
 msgstr ""
 
-#: src/mainwindow.c:603 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
 msgid "Next part"
 msgstr ""
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
 msgid "Previous part"
 msgstr ""
 
-#: src/mainwindow.c:607 src/messageview.c:260
+#: src/mainwindow.c:608 src/messageview.c:261
 msgid "Message scroll"
 msgstr ""
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:609 src/messageview.c:262
 msgid "Previous line"
 msgstr ""
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:610 src/messageview.c:263
 msgid "Next line"
 msgstr ""
 
-#: src/mainwindow.c:610 src/messageview.c:263 src/printing.c:482
+#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:478
 msgid "Previous page"
 msgstr ""
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:488
+#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:484
 msgid "Next page"
 msgstr ""
 
-#: src/mainwindow.c:629 src/messageview.c:282
+#: src/mainwindow.c:630 src/messageview.c:283
 msgid "Decode"
 msgstr ""
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:637
 msgid "Open in new _window"
 msgstr ""
 
-#: src/mainwindow.c:637 src/messageview.c:289
+#: src/mainwindow.c:638 src/messageview.c:290
 msgid "Mess_age source"
 msgstr ""
 
-#: src/mainwindow.c:639 src/messageview.c:290
+#: src/mainwindow.c:640 src/messageview.c:291
 msgid "Message part"
 msgstr ""
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:641 src/messageview.c:292
 msgid "View as text"
 msgstr ""
 
-#: src/mainwindow.c:641 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
 msgid "Open"
 msgstr ""
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:644 src/messageview.c:295
 msgid "Open with..."
 msgstr ""
 
-#: src/mainwindow.c:647 src/messageview.c:297
+#: src/mainwindow.c:648 src/messageview.c:298
 msgid "Quotes"
 msgstr ""
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:650
 msgid "_Update summary"
 msgstr ""
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:653
 msgid "Recei_ve"
 msgstr ""
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:654
 msgid "Get from _current account"
 msgstr ""
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:655
 msgid "Get from _all accounts"
 msgstr ""
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:656
 msgid "Cancel receivin_g"
 msgstr ""
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:659
 msgid "_Send queued messages"
 msgstr ""
 
-#: src/mainwindow.c:663
+#: src/mainwindow.c:664
 msgid "Compose a_n email message"
 msgstr ""
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:665
 msgid "Compose a news message"
 msgstr ""
 
-#: src/mainwindow.c:666 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:97 src/summaryview.c:426
+#: src/mainwindow.c:667 src/messageview.c:304
+#: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr ""
 
-#: src/mainwindow.c:667 src/messageview.c:304 src/summaryview.c:427
+#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr ""
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/summaryview.c:430
+#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr ""
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:672
 msgid "Follow-up and reply to"
 msgstr ""
 
-#: src/mainwindow.c:674 src/messageview.c:310 src/summaryview.c:432
-#: src/toolbar.c:2450
+#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
+#: src/toolbar.c:2491
 msgid "_Forward"
 msgstr ""
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
-#: src/toolbar.c:2451
+#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
+#: src/toolbar.c:2492
 msgid "For_ward as attachment"
 msgstr ""
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
-#: src/toolbar.c:2452
+#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
+#: src/toolbar.c:2493
 msgid "Redirec_t"
 msgstr ""
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:679
 msgid "Mailing-_List"
 msgstr ""
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:680
 msgid "Post"
 msgstr ""
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:682
 msgid "Help"
 msgstr ""
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:686
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/mainwindow.c:687
+#: src/mainwindow.c:688
 msgid "View archive"
 msgstr ""
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:690
 msgid "Contact owner"
 msgstr ""
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:694
 msgid "M_ove..."
 msgstr ""
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:695
 msgid "_Copy..."
 msgstr ""
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:696
 msgid "Move to _trash"
 msgstr "Move to was_tebin"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:697
 msgid "_Delete..."
 msgstr ""
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:698
 msgid "Move thread to tr_ash"
 msgstr "Move thread to was_tebin"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:699
 msgid "Delete t_hread"
 msgstr ""
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:700
 msgid "Cancel a news message"
 msgstr ""
 
-#: src/mainwindow.c:702 src/mainwindow.c:703 src/summaryview.c:435
+#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
 msgid "_Mark"
 msgstr ""
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:705
 msgid "_Unmark"
 msgstr ""
 
-#: src/mainwindow.c:707
+#: src/mainwindow.c:708
 msgid "Mark as rea_d"
 msgstr ""
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:709
 msgid "Mark as unr_ead"
 msgstr ""
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:711
 msgid "Mark all read in folder"
 msgstr ""
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:712
 msgid "Mark all unread in folder"
 msgstr ""
 
-#: src/mainwindow.c:713 src/prefs_filtering_action.c:191 src/toolbar.c:242
-#: src/toolbar.c:503
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Ignore thread"
 msgstr ""
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:715
 msgid "Unignore thread"
 msgstr ""
 
-#: src/mainwindow.c:715 src/prefs_filtering_action.c:192 src/toolbar.c:243
-#: src/toolbar.c:504
+#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
+#: src/toolbar.c:514
 msgid "Watch thread"
 msgstr ""
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:717
 msgid "Unwatch thread"
 msgstr ""
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:720
 msgid "Mark as _spam"
 msgstr ""
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:721
 msgid "Mark as _ham"
 msgstr ""
 
-#: src/mainwindow.c:723 src/prefs_filtering_action.c:175 src/toolbar.c:507
+#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
 msgid "Lock"
 msgstr ""
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:176 src/toolbar.c:508
+#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
 msgid "Unlock"
 msgstr ""
 
-#: src/mainwindow.c:726 src/summaryview.c:436
+#: src/mainwindow.c:727 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Colour la_bel"
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:728 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr ""
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:731
 msgid "Re-_edit"
 msgstr ""
 
-#: src/mainwindow.c:733 src/messageview.c:313 src/mimeview.c:1056
+#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
 msgid "Check signature"
 msgstr ""
 
-#: src/mainwindow.c:738 src/messageview.c:317
+#: src/mainwindow.c:739 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr ""
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:741
 msgid "C_ollect addresses"
 msgstr ""
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:742
 msgid "From current _folder..."
 msgstr ""
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:743
 msgid "From selected _messages..."
 msgstr ""
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:746
 msgid "_Filter all messages in folder"
 msgstr ""
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:747
 msgid "Filter _selected messages"
 msgstr ""
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:748
 msgid "Run folder pr_ocessing rules"
 msgstr ""
 
-#: src/mainwindow.c:749 src/messageview.c:320
+#: src/mainwindow.c:750 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr ""
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/messageview.c:329
 msgid "_Automatically"
 msgstr ""
 
-#: src/mainwindow.c:751 src/mainwindow.c:757 src/mainwindow.c:864
-#: src/messageview.c:322 src/messageview.c:328
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr ""
 
-#: src/mainwindow.c:752 src/mainwindow.c:758 src/mainwindow.c:865
-#: src/messageview.c:323 src/messageview.c:329
+#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr ""
 
-#: src/mainwindow.c:753 src/mainwindow.c:759 src/messageview.c:324
-#: src/messageview.c:330
+#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/messageview.c:332
 msgid "By _Subject"
 msgstr ""
 
-#: src/mainwindow.c:755 src/messageview.c:326 src/summaryview.c:440
+#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/messageview.c:333
+msgid "By S_ender"
+msgstr ""
+
+#: src/mainwindow.c:757 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr ""
 
-#: src/mainwindow.c:762 src/messageview.c:333
+#: src/mainwindow.c:765 src/messageview.c:336
 msgid "List _URLs..."
 msgstr ""
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:772
 msgid "Ch_eck for new messages in all folders"
 msgstr ""
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "Delete du_plicated messages"
 msgstr ""
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "In selected folder"
 msgstr ""
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:775
 msgid "In all folders"
 msgstr ""
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:778
 msgid "E_xecute"
 msgstr ""
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:779
 msgid "Exp_unge"
 msgstr ""
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:782
 msgid "TLS cer_tificates"
 msgstr ""
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:785
 msgid "Filtering Lo_g"
 msgstr ""
 
-#: src/mainwindow.c:783
+#: src/mainwindow.c:786
 msgid "Network _Log"
 msgstr ""
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:788
 msgid "Debug _Log"
 msgstr ""
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:791
 msgid "_Forget all session passwords"
 msgstr ""
 
-#: src/mainwindow.c:790
-msgid "Forget _master passphrase"
+#: src/mainwindow.c:793
+msgid "Forget _primary passphrase"
 msgstr ""
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:797
 msgid "C_hange current account"
 msgstr ""
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:799
 msgid "_Preferences for current account..."
 msgstr ""
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:800
 msgid "Create _new account..."
 msgstr ""
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:801
 msgid "_Edit accounts..."
 msgstr ""
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:804
 msgid "P_references..."
 msgstr ""
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:805
 msgid "Pre-pr_ocessing..."
 msgstr ""
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:806
 msgid "Post-pro_cessing..."
 msgstr ""
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:807
 msgid "_Filtering..."
 msgstr ""
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:808
 msgid "_Templates..."
 msgstr ""
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:809
 msgid "_Actions..."
 msgstr ""
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:810
 msgid "Tag_s..."
 msgstr ""
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:812
 msgid "Plu_gins..."
 msgstr ""
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:815
 msgid "_Manual"
 msgstr ""
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:816
 msgid "_Online User-contributed FAQ"
 msgstr ""
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:817
 msgid "Icon _Legend"
 msgstr ""
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:819
 msgid "Set as default client"
 msgstr ""
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:826
 msgid "Offline _mode"
 msgstr ""
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:827
 msgid "Men_ubar"
 msgstr ""
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:828
 msgid "_Message view"
 msgstr ""
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:830
 msgid "Status _bar"
 msgstr ""
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:832
 msgid "Column headers"
 msgstr ""
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:833
 msgid "Th_read view"
 msgstr ""
 
-#: src/mainwindow.c:831 src/prefs_summaries.c:667
+#: src/mainwindow.c:834 src/prefs_summaries.c:669
 msgid "Hide read threads"
 msgstr ""
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:835
 msgid "_Hide read messages"
 msgstr ""
 
-#: src/mainwindow.c:833 src/prefs_summaries.c:673
+#: src/mainwindow.c:836 src/prefs_summaries.c:675
 msgid "Hide deleted messages"
 msgstr ""
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:837
 msgid "_Fullscreen"
 msgstr ""
 
-#: src/mainwindow.c:835 src/messageview.c:345
+#: src/mainwindow.c:838 src/messageview.c:348
 msgid "Show all _headers"
 msgstr ""
 
-#: src/mainwindow.c:836 src/messageview.c:346
+#: src/mainwindow.c:839 src/messageview.c:349
 msgid "_Collapse all"
 msgstr ""
 
-#: src/mainwindow.c:837 src/messageview.c:347
+#: src/mainwindow.c:840 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr ""
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:841 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr ""
 
-#: src/mainwindow.c:842
+#: src/mainwindow.c:845
 msgid "Text _below icons"
 msgstr ""
 
-#: src/mainwindow.c:843
+#: src/mainwindow.c:846
 msgid "Text be_side icons"
 msgstr ""
 
-#: src/mainwindow.c:844
+#: src/mainwindow.c:847
 msgid "_Icons only"
 msgstr ""
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:848
 msgid "_Text only"
 msgstr ""
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:855
 msgid "_Standard"
 msgstr ""
 
-#: src/mainwindow.c:853
+#: src/mainwindow.c:856
 msgid "_Three columns"
 msgstr ""
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:857
 msgid "_Wide message"
 msgstr ""
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:858
 msgid "W_ide message list"
 msgstr ""
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:859
 msgid "S_mall screen"
 msgstr ""
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:863
 msgid "By _number"
 msgstr ""
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:864
 msgid "By s_ize"
 msgstr ""
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:865
 msgid "By _date"
 msgstr ""
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:866
 msgid "By thread date"
 msgstr ""
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:869
 msgid "By s_ubject"
 msgstr ""
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:870
 msgid "By _color label"
 msgstr "By _colour label"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:871
 msgid "By tag"
 msgstr ""
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:872
 msgid "By _mark"
 msgstr ""
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:873
 msgid "By _status"
 msgstr ""
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:874
 msgid "By a_ttachment"
 msgstr ""
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:875
 msgid "By score"
 msgstr ""
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:876
 msgid "By locked"
 msgstr ""
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:877
 msgid "D_on't sort"
 msgstr ""
 
-#: src/mainwindow.c:878 src/prefs_summaries.c:654
+#: src/mainwindow.c:881 src/prefs_summaries.c:656
 msgid "Ascending"
 msgstr ""
 
-#: src/mainwindow.c:879 src/prefs_summaries.c:655
+#: src/mainwindow.c:882 src/prefs_summaries.c:657
 msgid "Descending"
 msgstr ""
 
-#: src/mainwindow.c:921 src/messageview.c:390
+#: src/mainwindow.c:924 src/messageview.c:393
 msgid "_Auto detect"
 msgstr ""
 
-#: src/mainwindow.c:1299 src/summaryview.c:6477
-msgid "Apply tags..."
+#: src/mainwindow.c:1299 src/summaryview.c:6489
+msgid "Modify tags..."
 msgstr ""
 
-#: src/mainwindow.c:1941
+#: src/mainwindow.c:1924
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
-#: src/mainwindow.c:1960
+#: src/mainwindow.c:1955
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
-#: src/mainwindow.c:1963
+#: src/mainwindow.c:1958
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1972
 msgid "Select account"
 msgstr ""
 
-#: src/mainwindow.c:2004 src/prefs_logging.c:136
+#: src/mainwindow.c:1999 src/prefs_logging.c:136
 msgid "Network log"
 msgstr ""
 
-#: src/mainwindow.c:2008
+#: src/mainwindow.c:2003
 msgid "Filtering/Processing debug log"
 msgstr ""
 
-#: src/mainwindow.c:2027 src/prefs_logging.c:378
+#: src/mainwindow.c:2022 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2029 src/prefs_logging.c:380
+#: src/mainwindow.c:2024 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2458 src/mainwindow.c:2465 src/mainwindow.c:2508
-#: src/mainwindow.c:2541 src/mainwindow.c:2573 src/mainwindow.c:2618
+#: src/mainwindow.c:2453 src/mainwindow.c:2460 src/mainwindow.c:2503
+#: src/mainwindow.c:2536 src/mainwindow.c:2568 src/mainwindow.c:2613
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1075
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr ""
 
-#: src/mainwindow.c:2619 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
 msgid "none"
 msgstr ""
 
-#: src/mainwindow.c:2876 src/mainwindow.c:2881
+#: src/mainwindow.c:2871 src/mainwindow.c:2876
 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 
-#: src/mainwindow.c:2877
+#: src/mainwindow.c:2872
 msgid "Don't quit"
 msgstr ""
 
-#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2909
+#: src/mainwindow.c:2904
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7714,25 +7806,25 @@ msgid ""
 "scanned automatically."
 msgstr ""
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/mainwindow.c:2912 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:2922 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2927 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2922 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:3394
+#: src/mainwindow.c:3389
 msgid "No posting allowed"
 msgstr ""
 
@@ -7756,187 +7848,187 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
-#: src/mainwindow.c:4209
+#: src/mainwindow.c:4210
 msgid "Folder synchronisation"
 msgstr ""
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4211
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4212
 msgid "_Synchronise"
 msgstr ""
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4695
 msgid "Deleting duplicated messages..."
 msgstr ""
 
-#: src/mainwindow.c:4699
+#: src/mainwindow.c:4705
 msgid "No duplicate message found in selected folder.\n"
 msgstr ""
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4711
 #, 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:4709
+#: src/mainwindow.c:4715
 #, 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:4747
+#: src/mainwindow.c:4753
 msgid "Deleting duplicated messages in all folders..."
 msgstr ""
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4759
 #, 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:4758
+#: src/mainwindow.c:4764
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr ""
 
-#: src/mainwindow.c:4920 src/messageview.c:2634
+#: src/mainwindow.c:4926 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr ""
 
-#: src/mainwindow.c:5021 src/summaryview.c:5918
+#: src/mainwindow.c:5029 src/summaryview.c:5932
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5029
+#: src/mainwindow.c:5037
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5037 src/summaryview.c:5929
+#: src/mainwindow.c:5045 src/summaryview.c:5943
 msgid "Filtering configuration"
 msgstr ""
 
-#: src/mainwindow.c:5152
+#: src/mainwindow.c:5158
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 
-#: src/mainwindow.c:5211
+#: src/mainwindow.c:5249
 msgid "Claws Mail has been registered as default client."
 msgstr ""
 
-#: src/mainwindow.c:5213
+#: src/mainwindow.c:5251
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 
-#: src/mainwindow.c:5227 src/setup.c:91
+#: src/mainwindow.c:5265 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr ""
 
-#: src/mainwindow.c:5371
+#: src/mainwindow.c:5409
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
-#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
+#: src/matcher.c:216 src/matcher.c:217 src/matcher.c:218 src/matcher.c:219
+#: src/matcher.c:220 src/matcher.c:221 src/matcher.c:222 src/matcher.c:223
 #, c-format
 msgid "%s header"
 msgstr ""
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header"
 msgstr ""
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "header line"
 msgstr ""
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "body line"
 msgstr ""
 
-#: src/matcher.c:228
+#: src/matcher.c:227
 msgid "tag"
 msgstr ""
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr ""
 
-#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
 msgid "Case insensitive"
 msgstr ""
 
-#: src/matcher.c:1903
+#: src/matcher.c:1902
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr ""
 
-#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
+#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
 msgid "message matches\n"
 msgstr ""
 
-#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
+#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
 msgid "message does not match\n"
 msgstr ""
 
-#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
-#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
+#: src/matcher.c:2274 src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277
+#: src/matcher.c:2278 src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281
 msgid "(none)"
 msgstr ""
 
-#: src/mbox.c:98
+#: src/mbox.c:94
 #, c-format
 msgid ""
 "Could not stat mbox file:\n"
 "%s\n"
 msgstr ""
 
-#: src/mbox.c:104
+#: src/mbox.c:100
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"
 msgstr ""
 
-#: src/mbox.c:142
+#: src/mbox.c:138
 #, c-format
 msgid "Importing from mbox... (%ld MB imported)"
 msgid_plural "Importing from mbox... (%ld MB imported)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mbox.c:550
+#: src/mbox.c:547
 msgid "Overwrite mbox file"
 msgstr ""
 
-#: src/mbox.c:551
+#: src/mbox.c:548
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/mbox.c:552 src/mimeview.c:1910 src/prefs_themes.c:596
+#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
 msgid "Overwrite"
 msgstr ""
 
-#: src/mbox.c:561
+#: src/mbox.c:558
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
 msgstr ""
 
-#: src/mbox.c:565
+#: src/mbox.c:562
 msgid "Exporting to mbox..."
 msgstr ""
 
@@ -7948,14 +8040,6 @@ msgstr ""
 msgid "Find text:"
 msgstr ""
 
-#: src/message_search.c:228 src/summary_search.c:485 src/wizard.c:1810
-msgid "_Previous"
-msgstr ""
-
-#: src/message_search.c:233 src/summary_search.c:490 src/wizard.c:1811
-msgid "_Next"
-msgstr ""
-
 #: src/message_search.c:318 src/summary_search.c:783
 msgid "Search failed"
 msgstr ""
@@ -7972,23 +8056,27 @@ msgstr ""
 msgid "End of message reached; continue from beginning?"
 msgstr ""
 
-#: src/message_search.c:334 src/summary_search.c:795
+#: src/message_search.c:334 src/summary_search.c:796
 msgid "Search finished"
 msgstr ""
 
-#: src/messageview.c:300 src/textview.c:225
+#: src/messageview.c:251
+msgid "Previous opened message"
+msgstr ""
+
+#: src/messageview.c:301 src/textview.c:248
 msgid "Compose _new message"
 msgstr ""
 
-#: src/messageview.c:712 src/messageview.c:1436 src/messageview.c:1587
+#: src/messageview.c:717 src/messageview.c:1442 src/messageview.c:1593
 msgid "Claws Mail - Message View"
 msgstr ""
 
-#: src/messageview.c:843
+#: src/messageview.c:848
 msgid "<No Return-Path found>"
 msgstr ""
 
-#: src/messageview.c:850
+#: src/messageview.c:855
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7998,92 +8086,92 @@ msgid ""
 "It is advised to not send the return receipt."
 msgstr ""
 
-#: src/messageview.c:857
+#: src/messageview.c:862
 msgid "_Don't Send"
 msgstr ""
 
-#: src/messageview.c:1366
+#: src/messageview.c:1372
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr ""
 
-#: src/messageview.c:1402 src/procmime.c:1001
+#: src/messageview.c:1408 src/procmime.c:1026
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
-#: src/messageview.c:1483 src/messageview.c:1491
+#: src/messageview.c:1489 src/messageview.c:1497
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 
-#: src/messageview.c:1868
+#: src/messageview.c:1881
 #, c-format
 msgid "Show all %s."
 msgstr ""
 
-#: src/messageview.c:1870
+#: src/messageview.c:1883
 msgid "Only the first megabyte of text is shown."
 msgstr ""
 
-#: src/messageview.c:1901
+#: src/messageview.c:1914
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 
-#: src/messageview.c:1904
+#: src/messageview.c:1917
 msgid "You asked for a return receipt in this message."
 msgstr ""
 
-#: src/messageview.c:1910
+#: src/messageview.c:1923
 msgid "This message asks for a return receipt."
 msgstr ""
 
-#: src/messageview.c:1911
+#: src/messageview.c:1924
 msgid "Send receipt"
 msgstr ""
 
-#: src/messageview.c:1954
+#: src/messageview.c:1967
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
-#: src/messageview.c:1960
+#: src/messageview.c:1973
 #, 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:1977 src/messageview.c:1999
 msgid "Mark for download"
 msgstr ""
 
-#: src/messageview.c:1965 src/messageview.c:1977
+#: src/messageview.c:1978 src/messageview.c:1990
 msgid "Mark for deletion"
 msgstr ""
 
-#: src/messageview.c:1970
+#: src/messageview.c:1983
 #, 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:174 src/toolbar.c:506
+#: src/messageview.c:1988 src/messageview.c:2001
+#: src/prefs_filtering_action.c:174 src/toolbar.c:516
 msgid "Unmark"
 msgstr ""
 
-#: src/messageview.c:1981
+#: src/messageview.c:1994
 #, 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:2071
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -8093,15 +8181,15 @@ msgid ""
 "It is advised to not send the return receipt."
 msgstr ""
 
-#: src/messageview.c:2066 src/messageview.c:2074
+#: src/messageview.c:2079 src/messageview.c:2086
 msgid "Return Receipt Notification"
 msgstr ""
 
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2080 src/messageview.c:2091
 msgid "_Send Notification"
 msgstr ""
 
-#: src/messageview.c:2075
+#: src/messageview.c:2087
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8109,30 +8197,30 @@ msgid ""
 "notification:"
 msgstr ""
 
-#: src/messageview.c:2171 src/messageview.c:2190
+#: src/messageview.c:2183 src/messageview.c:2202
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
-#: src/messageview.c:2944
+#: src/messageview.c:2958
 msgid ""
 "\n"
 "  There are no messages in this folder"
 msgstr ""
 
-#: src/messageview.c:2952
+#: src/messageview.c:2966
 msgid ""
 "\n"
 "  Message has been deleted"
 msgstr ""
 
-#: src/messageview.c:2953
+#: src/messageview.c:2967
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4399
-#: src/summaryview.c:7278
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
+#: src/summaryview.c:7290
 msgid "An error happened while learning.\n"
 msgstr ""
 
@@ -8140,7 +8228,7 @@ msgstr ""
 msgid "Moving messages..."
 msgstr ""
 
-#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:836
 msgid "Deleting messages..."
 msgstr ""
 
@@ -8148,7 +8236,7 @@ msgstr ""
 msgid "Remove _mailbox..."
 msgstr ""
 
-#: src/mh_gtk.c:222
+#: src/mh_gtk.c:223
 #, c-format
 msgid ""
 "Can't remove the folder '%s'\n"
@@ -8156,18 +8244,18 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:299
+#: src/mh_gtk.c:373 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:301
+#: src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr ""
 
-#: src/mimeview.c:221
+#: src/mimeview.c:221 src/prefs_actions.c:1315
 msgid "_Open"
 msgstr ""
 
@@ -8199,122 +8287,131 @@ msgstr ""
 msgid "MIME Type"
 msgstr ""
 
-#: src/mimeview.c:1061 src/mimeview.c:1066 src/mimeview.c:1071
-#: src/mimeview.c:1076
+#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
+#: src/mimeview.c:1072
 msgid "View full information"
 msgstr ""
 
-#: src/mimeview.c:1082
+#: src/mimeview.c:1079
 msgid "Check again"
 msgstr ""
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1092
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr ""
 
-#: src/mimeview.c:1096
+#: src/mimeview.c:1094
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr ""
 
-#: src/mimeview.c:1106
+#: src/mimeview.c:1101
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 
-#: src/mimeview.c:1108
+#: src/mimeview.c:1103
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 
-#: src/mimeview.c:1353
+#: src/mimeview.c:1110
+msgid "Error checking the signature. Click the icon to try again."
+msgstr ""
+
+#: src/mimeview.c:1112
+#, c-format
+msgid "Error checking the signature. Click the icon or hit '%s' to try again."
+msgstr ""
+
+#: src/mimeview.c:1231
 msgid "Checking signature..."
 msgstr ""
 
-#: src/mimeview.c:1394
+#: src/mimeview.c:1286
 msgid "Go back to email"
 msgstr ""
 
-#: src/mimeview.c:1828 src/mimeview.c:1920 src/mimeview.c:2162
-#: src/mimeview.c:2198 src/mimeview.c:2310 src/plugins/fancy/fancy_viewer.c:501
-#: src/plugins/fancy/fancy_viewer.c:530
+#: src/mimeview.c:1736 src/mimeview.c:1828 src/mimeview.c:2070
+#: src/mimeview.c:2106 src/mimeview.c:2218 src/plugins/fancy/fancy_viewer.c:509
+#: src/plugins/fancy/fancy_viewer.c:538
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 
-#: src/mimeview.c:1907
+#: src/mimeview.c:1815
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr ""
 
-#: src/mimeview.c:1931
+#: src/mimeview.c:1839
 #, 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:1934
+#: src/mimeview.c:1842
 msgid "Error saving all message parts"
 msgstr ""
 
-#: src/mimeview.c:1935
+#: src/mimeview.c:1843
 msgid "Skip"
 msgstr ""
 
-#: src/mimeview.c:1935
+#: src/mimeview.c:1843
 msgid "Skip all"
 msgstr ""
 
-#: src/mimeview.c:1945
+#: src/mimeview.c:1853
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1953
+#: src/mimeview.c:1861
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1958
+#: src/mimeview.c:1866
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1991 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1899 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr ""
 
-#: src/mimeview.c:1998 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1906 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr ""
 
-#: src/mimeview.c:2115 src/plugins/fancy/fancy_viewer.c:803
-#: src/summaryview.c:5011
+#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
+#: src/summaryview.c:5017
 msgid "Save as"
 msgstr ""
 
-#: src/mimeview.c:2245 src/mimeview.c:2252
+#: src/mimeview.c:2153 src/mimeview.c:2160
 msgid "Open with"
 msgstr ""
 
-#: src/mimeview.c:2246 src/mimeview.c:2253
+#: src/mimeview.c:2154 src/mimeview.c:2161
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 
-#: src/mimeview.c:2348
+#: src/mimeview.c:2256
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8322,11 +8419,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/mimeview.c:2356
+#: src/mimeview.c:2264
 msgid "Execute untrusted binary?"
 msgstr ""
 
-#: src/mimeview.c:2357
+#: src/mimeview.c:2265
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8334,22 +8431,22 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 
-#: src/mimeview.c:2361
+#: src/mimeview.c:2269
 msgid "Run binary"
 msgstr ""
 
-#: src/mimeview.c:2662 src/plugins/att_remover/att_remover.c:305
+#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr ""
 
-#: src/mimeview.c:2663 src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2779
+#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
 msgid "Size:"
 msgstr ""
 
-#: src/mimeview.c:2677 src/plugins/vcalendar/vcalendar.c:1243
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1618
+#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1612
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
 msgid "Description:"
 msgstr ""
 
@@ -8396,34 +8493,34 @@ msgstr ""
 msgid "couldn't select group: %s\n"
 msgstr ""
 
-#: src/news.c:1067 src/news.c:1253
+#: src/news.c:1068 src/news.c:1254
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr ""
 
-#: src/news.c:1076
+#: src/news.c:1077
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 
-#: src/news.c:1154 src/news.c:1181 src/news.c:1208
+#: src/news.c:1155 src/news.c:1182 src/news.c:1209
 msgid "couldn't get xhdr\n"
 msgstr ""
 
-#: src/news.c:1246
+#: src/news.c:1247
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
-#: src/news.c:1261
+#: src/news.c:1262
 msgid "couldn't get xover\n"
 msgstr ""
 
-#: src/news.c:1278
+#: src/news.c:1279
 msgid "invalid xover line\n"
 msgstr ""
 
-#: src/news.c:1480
+#: src/news.c:1481
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8448,74 +8545,81 @@ msgstr ""
 msgid "Unsubscribe newsgroup"
 msgstr ""
 
-#: src/news_gtk.c:291
+#: src/news_gtk.c:294
 msgid "Rename newsgroup folder"
 msgstr ""
 
-#: src/oauth2.c:238
-#, fuzzy
+#: src/oauth2.c:239
 msgid "OAuth2 missing authorization code\n"
-msgstr "Obtain authorisation code"
+msgstr "OAuth2 missing authorisation code\n"
 
-#: src/oauth2.c:244 src/oauth2.c:359
+#: src/oauth2.c:245 src/oauth2.c:398
 msgid "OAuth2 connection error\n"
 msgstr ""
 
-#: src/oauth2.c:253 src/oauth2.c:367
+#: src/oauth2.c:255 src/oauth2.c:407
 msgid "OAuth2 TLS connection error\n"
 msgstr ""
 
-#: src/oauth2.c:311 src/oauth2.c:418
+#: src/oauth2.c:346 src/oauth2.c:480
 msgid "OAuth2 access token obtained\n"
 msgstr ""
 
-#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
 msgid "OAuth2 access token not obtained\n"
 msgstr ""
 
-#: src/oauth2.c:320
+#: src/oauth2.c:355
 msgid "OAuth2 refresh token obtained\n"
 msgstr ""
 
-#: src/oauth2.c:322
+#: src/oauth2.c:357
 msgid "OAuth2 refresh token not obtained\n"
 msgstr ""
 
-#: src/oauth2.c:452
+#: src/oauth2.c:489
+msgid "OAuth2 replacement refresh token provided\n"
+msgstr ""
+
+#: src/oauth2.c:491
+msgid "OAuth2 replacement refresh token not provided\n"
+msgstr ""
+
+#: src/oauth2.c:522
 msgid "OAuth2 socket write error\n"
 msgstr ""
 
-#: src/oauth2.c:472
+#: src/oauth2.c:544
 msgid "OAuth2 socket timeout error\n"
 msgstr ""
 
-#: src/oauth2.c:528
+#: src/oauth2.c:638
 msgid "OAuth2 access token still fresh\n"
 msgstr ""
 
-#: src/oauth2.c:534
+#: src/oauth2.c:645
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr ""
 
-#: src/oauth2.c:538
+#: src/oauth2.c:649
 msgid "OAuth2 trying for fresh access token with authorization code\n"
-msgstr ""
+msgstr "OAuth2 trying for fresh access token with authorisation code\n"
 
-#: src/oauth2.c:552
-msgid "OAuth2 access token updated\n"
+#: src/oauth2.c:666
+msgid "OAuth2 access and refresh token updated\n"
 msgstr ""
 
-#: src/oauth2.c:583
+#: src/oauth2.c:698
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr ""
 
-#: src/oauth2.c:584
+#: src/oauth2.c:699
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr ""
 
-#: src/oauth2.c:585
+#: src/oauth2.c:700
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
@@ -8523,11 +8627,11 @@ msgid ""
 msgstr ""
 
 #: src/password.c:128 src/password.c:129
-msgid "Input master passphrase"
+msgid "Input primary passphrase"
 msgstr ""
 
 #: src/password.c:141
-msgid "Incorrect master passphrase."
+msgid "Incorrect primary passphrase."
 msgstr ""
 
 #: src/password_gtk.c:66
@@ -8535,137 +8639,138 @@ msgid "New passphrases do not match, try again."
 msgstr ""
 
 #: src/password_gtk.c:79
-msgid "Incorrect old master passphrase entered, try again."
+msgid "Incorrect old primary passphrase entered, try again."
 msgstr ""
 
-#: src/password_gtk.c:144
-msgid "Changing master passphrase"
+#: src/password_gtk.c:143
+msgid "Changing primary passphrase"
 msgstr ""
 
-#: src/password_gtk.c:165
+#: src/password_gtk.c:164
 msgid ""
-"If a master passphrase is currently active, it\n"
+"If a primary passphrase is currently active, it\n"
 "needs to be entered."
 msgstr ""
 
-#: src/password_gtk.c:175
+#: src/password_gtk.c:174
 msgid "Old passphrase:"
 msgstr ""
 
-#: src/password_gtk.c:189
+#: src/password_gtk.c:188
 msgid "New passphrase:"
 msgstr ""
 
-#: src/password_gtk.c:200
+#: src/password_gtk.c:199
 msgid "Confirm passphrase:"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:55
+#: src/plugins/acpi_notifier/acpi_notifier.c:54
 msgid "Acpi Notifier"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:70
 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:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:72
 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:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:77
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:78
+#: src/plugins/acpi_notifier/acpi_notifier.c:77
 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:211
-#: src/plugins/acpi_notifier/acpi_notifier.c:217
-#: src/plugins/acpi_notifier/acpi_notifier.c:419
+#: src/plugins/acpi_notifier/acpi_notifier.c:210
+#: src/plugins/acpi_notifier/acpi_notifier.c:216
+#: src/plugins/acpi_notifier/acpi_notifier.c:418
 msgid "Control file doesn't exist."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:300
+#: src/plugins/acpi_notifier/acpi_notifier.c:299
 msgid " : no new or unread mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:301
+#: src/plugins/acpi_notifier/acpi_notifier.c:300
 msgid " : unread mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:302
+#: src/plugins/acpi_notifier/acpi_notifier.c:301
 msgid " : new mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:304
-#: src/plugins/acpi_notifier/acpi_notifier.c:310
-#: src/plugins/acpi_notifier/acpi_notifier.c:316
+#: src/plugins/acpi_notifier/acpi_notifier.c:303
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
 msgid "off"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
-#: src/plugins/acpi_notifier/acpi_notifier.c:312
-#: src/plugins/acpi_notifier/acpi_notifier.c:318
+#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:311
+#: src/plugins/acpi_notifier/acpi_notifier.c:317
 msgid "blinking"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
-#: src/plugins/acpi_notifier/acpi_notifier.c:314
-#: src/plugins/acpi_notifier/acpi_notifier.c:320
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:313
+#: src/plugins/acpi_notifier/acpi_notifier.c:319
 msgid "on"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:341
-#: src/plugins/acpi_notifier/acpi_notifier.c:350
-#: src/plugins/acpi_notifier/acpi_notifier.c:365
+#: src/plugins/acpi_notifier/acpi_notifier.c:340
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:364
 msgid "LED "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:380
+#: src/plugins/acpi_notifier/acpi_notifier.c:379
 msgid "ACPI type: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:389
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI file: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:400
+#: src/plugins/acpi_notifier/acpi_notifier.c:399
 msgid "values - On: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:405
+#: src/plugins/acpi_notifier/acpi_notifier.c:404
 msgid " - Off: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:427
+#: src/plugins/acpi_notifier/acpi_notifier.c:426
 msgid "Blink when user interaction is required"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:853
+#: src/plugins/acpi_notifier/acpi_notifier.c:852
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:874
+#: src/plugins/acpi_notifier/acpi_notifier.c:873
 msgid "Laptop LED"
 msgstr ""
 
 #: src/plugins/address_keeper/address_keeper.c:252
 #: src/plugins/attachwarner/attachwarner.c:252
+#: src/plugins/keyword_warner/keyword_warner.c:230
 msgid "Failed to register check before send hook"
 msgstr ""
 
@@ -8693,7 +8798,7 @@ msgstr ""
 
 #: 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/bsfilter/bsfilter_gtk.c:200
 #: src/plugins/spamassassin/spamassassin_gtk.c:458
 #: src/prefs_filtering_action.c:548 src/prefs_filtering_action.c:555
 #: src/prefs_matcher.c:688
@@ -8717,7 +8822,7 @@ msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 
-#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:106
 msgid "Mail Archiver"
 msgstr ""
 
@@ -8886,17 +8991,17 @@ 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:725 src/prefs_folder_item.c:530
-#: src/prefs_folder_item.c:1180 src/prefs_folder_item.c:1210
+#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:534
+#: src/prefs_folder_item.c:1242 src/prefs_folder_item.c:1273
 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:728 src/prefs_folder_item.c:529
-#: src/prefs_folder_item.c:1179 src/prefs_folder_item.c:1209
-#: src/prefs_summaries.c:409
+#: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:533
+#: src/prefs_folder_item.c:1241 src/prefs_folder_item.c:1272
+#: src/prefs_summaries.c:407
 msgid "No"
 msgstr ""
 
@@ -8913,7 +9018,7 @@ msgid "Delete selected files"
 msgstr ""
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1330
+#: src/plugins/archive/archiver_gtk.c:1327
 msgid "Select mails before"
 msgstr ""
 
@@ -8921,187 +9026,187 @@ msgstr ""
 msgid "Select folder to archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:942
+#: src/plugins/archive/archiver_gtk.c:941
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:990
+#: src/plugins/archive/archiver_gtk.c:987
 #, c-format
 msgid "%ld of %ld"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1043
+#: src/plugins/archive/archiver_gtk.c:1040
 msgid "Create Archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1058
+#: src/plugins/archive/archiver_gtk.c:1055
 msgid "Enter Archiver arguments"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1072
+#: src/plugins/archive/archiver_gtk.c:1069
 msgid "Folder to archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1079
+#: src/plugins/archive/archiver_gtk.c:1076
 msgid "Folder which is the root of the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1081
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1087
 msgid "Name for archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1096
+#: src/plugins/archive/archiver_gtk.c:1093
 msgid "Archive location and name"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1098
-#: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:494
+#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_prefs.c:224
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "_Select"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1101
+#: src/plugins/archive/archiver_gtk.c:1098
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1103
+#: src/plugins/archive/archiver_gtk.c:1100
 msgid "Choose compression"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1115
-#: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1127
-#: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1140
-#: src/plugins/archive/archiver_gtk.c:1148
-#: src/plugins/archive/archiver_gtk.c:1156
-#: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1168
-#: src/plugins/archive/archiver_gtk.c:1176
-#: src/plugins/archive/archiver_gtk.c:1183
+#: src/plugins/archive/archiver_gtk.c:1112
+#: src/plugins/archive/archiver_gtk.c:1118
+#: src/plugins/archive/archiver_gtk.c:1124
+#: src/plugins/archive/archiver_gtk.c:1131
+#: src/plugins/archive/archiver_gtk.c:1137
+#: src/plugins/archive/archiver_gtk.c:1145
+#: src/plugins/archive/archiver_gtk.c:1153
+#: src/plugins/archive/archiver_gtk.c:1159
+#: src/plugins/archive/archiver_gtk.c:1165
+#: src/plugins/archive/archiver_gtk.c:1173
+#: src/plugins/archive/archiver_gtk.c:1180
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1232
+#: src/plugins/archive/archiver_gtk.c:1229
 msgid "Choose format"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1244
-#: src/plugins/archive/archiver_gtk.c:1250
-#: src/plugins/archive/archiver_gtk.c:1256
-#: src/plugins/archive/archiver_gtk.c:1262
+#: src/plugins/archive/archiver_gtk.c:1241
+#: src/plugins/archive/archiver_gtk.c:1247
+#: src/plugins/archive/archiver_gtk.c:1253
+#: src/plugins/archive/archiver_gtk.c:1259
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1282
+#: src/plugins/archive/archiver_gtk.c:1279
 msgid "Miscellaneous options"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1288
 msgid "_Recursive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1292
 msgid "Choose this option to include subfolders in the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1297
+#: src/plugins/archive/archiver_gtk.c:1294
 msgid "_MD5sum"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1301
+#: src/plugins/archive/archiver_gtk.c:1298
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
 "will take to create the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1305
+#: src/plugins/archive/archiver_gtk.c:1302
 msgid "R_ename"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1309
-#: src/plugins/archive/archiver_prefs.c:427
+#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from@to@subject.\n"
 "Names will be truncated to max 96 characters"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1317
+#: src/plugins/archive/archiver_gtk.c:1314
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1321
+#: src/plugins/archive/archiver_gtk.c:1318
 msgid "Selection options"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1337
+#: src/plugins/archive/archiver_gtk.c:1334
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:217
+#: src/plugins/archive/archiver_prefs.c:216
 msgid "Default save folder"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:229
+#: src/plugins/archive/archiver_prefs.c:228
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:238
+#: src/plugins/archive/archiver_prefs.c:237
 msgid "Default compression"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:249
-#: src/plugins/archive/archiver_prefs.c:255
-#: src/plugins/archive/archiver_prefs.c:261
-#: src/plugins/archive/archiver_prefs.c:268
-#: src/plugins/archive/archiver_prefs.c:274
-#: src/plugins/archive/archiver_prefs.c:282
-#: src/plugins/archive/archiver_prefs.c:290
-#: src/plugins/archive/archiver_prefs.c:296
-#: src/plugins/archive/archiver_prefs.c:302
-#: src/plugins/archive/archiver_prefs.c:310
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:248
+#: src/plugins/archive/archiver_prefs.c:254
+#: src/plugins/archive/archiver_prefs.c:260
+#: src/plugins/archive/archiver_prefs.c:267
+#: src/plugins/archive/archiver_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:281
+#: src/plugins/archive/archiver_prefs.c:289
+#: src/plugins/archive/archiver_prefs.c:295
+#: src/plugins/archive/archiver_prefs.c:301
+#: src/plugins/archive/archiver_prefs.c:309
+#: src/plugins/archive/archiver_prefs.c:316
 #, c-format
 msgid "Choose this option to use %s compression by default"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:363
+#: src/plugins/archive/archiver_prefs.c:362
 msgid "Default format"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:374
-#: src/plugins/archive/archiver_prefs.c:380
-#: src/plugins/archive/archiver_prefs.c:386
-#: src/plugins/archive/archiver_prefs.c:392
+#: src/plugins/archive/archiver_prefs.c:373
+#: src/plugins/archive/archiver_prefs.c:379
+#: src/plugins/archive/archiver_prefs.c:385
+#: src/plugins/archive/archiver_prefs.c:391
 #, c-format
 msgid "Choose this option to use the %s as format by default"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:409
+#: src/plugins/archive/archiver_prefs.c:408
 msgid "Default miscellaneous options"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:418
+#: src/plugins/archive/archiver_prefs.c:417
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:419
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "MD5sum"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:421
+#: src/plugins/archive/archiver_prefs.c:420
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -9109,67 +9214,67 @@ msgid ""
 "will take to create the archives"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:425
+#: src/plugins/archive/archiver_prefs.c:424
 msgid "Rename"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:433
+#: src/plugins/archive/archiver_prefs.c:432
 msgid "Choose this option to delete mails after archiving"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:338
+#: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:364
+#: src/plugins/att_remover/att_remover.c:363
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:372 src/prefs_summaries.c:643
-#: src/prefs_summary_column.c:79 src/summaryview.c:2873
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:425
 msgid "Destroy attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:427
+#: src/plugins/att_remover/att_remover.c:426
 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:470
+#: src/plugins/att_remover/att_remover.c:469
 msgid "The selected messages don't have any attachments."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:473
+#: src/plugins/att_remover/att_remover.c:472
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:476
+#: src/plugins/att_remover/att_remover.c:475
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:505
+#: src/plugins/att_remover/att_remover.c:504
 msgid "This message doesn't have any attachments."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:518
+#: src/plugins/att_remover/att_remover.c:517
 msgid "Remove attachments..."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:530
-#: src/plugins/att_remover/att_remover.c:590
+#: src/plugins/att_remover/att_remover.c:529
+#: src/plugins/att_remover/att_remover.c:589
 msgid "AttRemover"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:595
+#: src/plugins/att_remover/att_remover.c:594
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9177,11 +9282,11 @@ msgid ""
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:619
+#: src/plugins/att_remover/att_remover.c:618
 msgid "Attachment handling"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner.c:210
+#: src/plugins/attachwarner/attachwarner.c:211
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9190,14 +9295,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner.c:216
+#: src/plugins/attachwarner/attachwarner.c:217
 msgid "Attachment warning"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner.c:245
 #: src/plugins/attachwarner/attachwarner.c:282
 #: src/plugins/attachwarner/attachwarner.c:334
-msgid "Attach warner"
+#: src/plugins/attachwarner/attachwarner_prefs.c:235
+msgid "AttachWarner"
 msgstr ""
 
 #: src/plugins/attachwarner/attachwarner.c:292
@@ -9211,90 +9316,93 @@ msgid "attach"
 msgstr ""
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:83
-msgid "One of the following regular expressions is matched (one per line)"
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:83
+msgid ""
+"Warn when one of the following regular expressions is matched (one per line)"
 msgstr ""
 
 #: src/plugins/attachwarner/attachwarner_prefs.c:88
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:88
 msgid "Expressions are case sensitive"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:94
+#: src/plugins/attachwarner/attachwarner_prefs.c:95
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:95
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:116
+#: src/plugins/attachwarner/attachwarner_prefs.c:117
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:117
 msgid "Lines starting with quotation marks"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:123
+#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:125
 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:126
+#: src/plugins/attachwarner/attachwarner_prefs.c:130
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:130
 msgid "Forwarded or redirected messages"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:133
+#: src/plugins/attachwarner/attachwarner_prefs.c:138
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:136 src/prefs_msg_colors.c:305
+#: src/plugins/attachwarner/attachwarner_prefs.c:141
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:141
+#: src/prefs_msg_colors.c:305
 msgid "Signatures"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:143
+#: src/plugins/attachwarner/attachwarner_prefs.c:148
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:148
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:149
-msgid "Warn when"
-msgstr ""
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:153
-msgid "Excluding"
-msgstr ""
-
-#: src/plugins/attachwarner/attachwarner_prefs.c:231
-msgid "Attach Warner"
+#: src/plugins/attachwarner/attachwarner_prefs.c:157
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:157
+msgid "Exclude"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter.c:80
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter.c:106
 #: src/plugins/bogofilter/bogofilter_gtk.c:258
 #: src/plugins/bogofilter/bogofilter_gtk.c:331
 #: src/plugins/bogofilter/bogofilter_gtk.c:408
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/bsfilter/bsfilter.c:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter_gtk.c:265
+#: src/plugins/bsfilter/bsfilter_gtk.c:325
 #: src/plugins/spamassassin/spamassassin.c:118
 #: 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
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1658 src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1673 src/prefs_matcher.c:1675 src/prefs_matcher.c:2586
+#: src/prefs_matcher.c:2590
 msgid "Any"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:457
+#: src/plugins/bogofilter/bogofilter.c:456
 msgid "Bogofilter: fetching bodies..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:470
+#: src/plugins/bogofilter/bogofilter.c:469
 msgid "Bogofilter: filtering messages..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:586
+#: src/plugins/bogofilter/bogofilter.c:585
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9302,7 +9410,7 @@ msgid ""
 "with a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:593
+#: src/plugins/bogofilter/bogofilter.c:592
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
@@ -9314,7 +9422,7 @@ msgid "Bogofilter: learning from message..."
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
@@ -9346,38 +9454,38 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:643
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
+#: src/plugins/spamassassin/spamassassin.c:647
 msgid "Spam detection"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:644
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:648
 msgid "Spam learning"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
-#: src/plugins/bsfilter/bsfilter_gtk.c:143
+#: src/plugins/bsfilter/bsfilter_gtk.c:142
 #: 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/bsfilter/bsfilter_gtk.c:150
 #: 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/bsfilter/bsfilter_gtk.c:159
 #: 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/bsfilter/bsfilter_gtk.c:162
 #: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1684
-msgid "KB"
+msgid "KiB"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:192
@@ -9393,7 +9501,7 @@ msgid "Only mark as spam"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
-#: src/plugins/bsfilter/bsfilter_gtk.c:179
+#: src/plugins/bsfilter/bsfilter_gtk.c:178
 #: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
@@ -9401,7 +9509,7 @@ msgstr ""
 "Folder for storing identified spam. Leave empty to use the wastebin folder."
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
-#: src/plugins/bsfilter/bsfilter_gtk.c:185
+#: src/plugins/bsfilter/bsfilter_gtk.c:184
 #: src/plugins/spamassassin/spamassassin_gtk.c:433
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
@@ -9429,13 +9537,13 @@ msgid "Only done for messages in MH folders"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/plugins/bsfilter/bsfilter_gtk.c:191
+#: src/plugins/bsfilter/bsfilter_gtk.c:190
 #: 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/bsfilter/bsfilter_gtk.c:194
 #: src/plugins/spamassassin/spamassassin_gtk.c:452
 msgid ""
 "Messages coming from your address book contacts will be received in the "
@@ -9443,13 +9551,13 @@ msgid ""
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:205
+#: src/plugins/bsfilter/bsfilter_gtk.c:204
 #: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:268
-#: src/plugins/bsfilter/bsfilter_gtk.c:207
+#: src/plugins/bsfilter/bsfilter_gtk.c:206
 msgid "Learn whitelisted emails as ham"
 msgstr ""
 
@@ -9468,24 +9576,24 @@ msgid "Path to bogofilter executable"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
-#: src/plugins/bsfilter/bsfilter_gtk.c:232
+#: src/plugins/bsfilter/bsfilter_gtk.c:231
 #: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid "Mark spam as read"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:82 src/plugins/bsfilter/bsfilter_gtk.c:401
+#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:273
+#: src/plugins/bsfilter/bsfilter.c:271
 msgid "Bsfilter: fetching body..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:282
+#: src/plugins/bsfilter/bsfilter.c:280
 msgid "Bsfilter: filtering message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:367
+#: src/plugins/bsfilter/bsfilter.c:365
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9493,18 +9601,18 @@ msgid ""
 "a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:374
+#: src/plugins/bsfilter/bsfilter.c:372
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:475
+#: src/plugins/bsfilter/bsfilter.c:474
 msgid "Bsfilter: learning from message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:616
+#: src/plugins/bsfilter/bsfilter.c:615
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bsfilter. You will need Bsfilter installed "
@@ -9520,22 +9628,22 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bsfilter"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:171
+#: src/plugins/bsfilter/bsfilter_gtk.c:170
 #: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Save spam in"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:209
+#: src/plugins/bsfilter/bsfilter_gtk.c:208
 msgid ""
 "If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:218
+#: src/plugins/bsfilter/bsfilter_gtk.c:217
 msgid "Bsfilter call"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter_gtk.c:226
+#: src/plugins/bsfilter/bsfilter_gtk.c:225
 msgid "Path to bsfilter executable"
 msgstr ""
 
@@ -9558,46 +9666,46 @@ msgid ""
 "Is clamd running?"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:119
+#: src/plugins/clamd/clamav_plugin.c:120
 #, c-format
 msgid "Detected %s virus."
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:135
+#: src/plugins/clamd/clamav_plugin.c:137
 #, c-format
 msgid ""
 "Scanning error:\n"
 "%s"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:146
+#: src/plugins/clamd/clamav_plugin.c:148
 #, c-format
 msgid "File: %s. Size (%d) greater than limit (%d)\n"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:174
+#: src/plugins/clamd/clamav_plugin.c:177
 msgid "ClamAV: scanning message..."
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:280
+#: src/plugins/clamd/clamav_plugin.c:283
 msgid "Failed to register mail filtering hook"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:298
+#: src/plugins/clamd/clamav_plugin.c:301
 msgid ""
 "Init\n"
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:302
+#: src/plugins/clamd/clamav_plugin.c:305
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:333
+#: src/plugins/clamd/clamav_plugin.c:336
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -9620,7 +9728,7 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:372
+#: src/plugins/clamd/clamav_plugin.c:375
 msgid "Virus detection"
 msgstr ""
 
@@ -9727,58 +9835,58 @@ msgid ""
 "Is clamd running?"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:122
+#: src/plugins/clamd/libclamd/clamd-plugin.c:121
 #, c-format
 msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:217
+#: src/plugins/clamd/libclamd/clamd-plugin.c:210
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:251
+#: src/plugins/clamd/libclamd/clamd-plugin.c:244
 msgid "Could not create socket"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:442
+#: src/plugins/clamd/libclamd/clamd-plugin.c:435
 msgid ": File does not exist"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
+#: src/plugins/clamd/libclamd/clamd-plugin.c:448
 msgid ": Unable to open"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:474
-#: src/plugins/clamd/libclamd/clamd-plugin.c:479
-#: src/plugins/clamd/libclamd/clamd-plugin.c:493
+#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:472
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 msgid "Socket write error"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:486
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
 #, c-format
 msgid "%s: Error reading"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:500
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket read error"
 msgstr ""
 
-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
+#: src/plugins/demo/demo.c:33 src/plugins/demo/demo.c:102
 msgid "Demo"
 msgstr ""
 
-#: src/plugins/demo/demo.c:52
+#: src/plugins/demo/demo.c:54
 msgid "Failed to register log text hook"
 msgstr ""
 
-#: src/plugins/demo/demo.c:76
+#: src/plugins/demo/demo.c:78
 msgid ""
-"This Plugin is only a demo of how to write plugins for Claws Mail. It "
+"This plugin is only a demo of how to write plugins for Claws Mail. It "
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "It is not really useful."
@@ -9817,15 +9925,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:4257
-#: src/prefs_proxy.c:235
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4254
+#: src/prefs_proxy.c:237
 msgid "Proxy"
 msgstr ""
 
@@ -9861,7 +9969,7 @@ msgid "When clicking on a link, by default"
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:286
-msgid "Open in external browser"
+msgid "Open in External Browser"
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:300
@@ -9869,7 +9977,7 @@ msgid "The CSS in this file will be applied to all HTML parts"
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:310
-#: src/plugins/notification/notification_prefs.c:1341
+#: src/plugins/notification/notification_prefs.c:1334
 #: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
 #: src/prefs_account.c:1587 src/prefs_account.c:1706 src/prefs_account.c:2475
 #: src/prefs_customheader.c:228
@@ -9880,85 +9988,86 @@ msgstr ""
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:469
+#: src/plugins/fancy/fancy_viewer.c:477
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:578
+#: src/plugins/fancy/fancy_viewer.c:586
 msgid "Load images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:580
+#: src/plugins/fancy/fancy_viewer.c:588
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:582
+#: src/plugins/fancy/fancy_viewer.c:590
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:584
+#: src/plugins/fancy/fancy_viewer.c:592
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:594
 msgid "Enable Java"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:596
 msgid "Open links with external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:792
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:843
+#: src/plugins/fancy/fancy_viewer.c:852
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:865
+#: src/plugins/fancy/fancy_viewer.c:874
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:874
+#: src/plugins/fancy/fancy_viewer.c:883
 msgid "Open in Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:884
+#: src/plugins/fancy/fancy_viewer.c:893
 msgid "Open Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:902
 msgid "Copy Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:898
+#: src/plugins/fancy/fancy_viewer.c:907
 msgid "Download Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:909
+#: src/plugins/fancy/fancy_viewer.c:918
 msgid "Save Image As"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:919
+#: src/plugins/fancy/fancy_viewer.c:928
 msgid "Copy Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:957
+#: src/plugins/fancy/fancy_viewer.c:966
 msgid "Import feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1249
+#: src/plugins/fancy/fancy_viewer.c:1259
 msgid "Fancy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1277
+#. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
+#: src/plugins/fancy/fancy_viewer.c:1287
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1282
+#: src/plugins/fancy/fancy_viewer.c:1292
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9966,17 +10075,22 @@ msgid ""
 "Configuration/Preferences/Plugins/Fancy"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:160
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:193
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
+#. TRANSLATORS: Possible error message during plugin load
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:166
 msgid "Failed to register mail receive hook"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
+#. TRANSLATORS: Description seen in plugins dialog.
+#. * Translation of "Plugins" part of preferences path should to be
+#. * the same as translation of "Plugins" string in Claws Mail message
+#. * catalog.
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:202
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -9985,10 +10099,12 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
+#. TRANSLATORS: Description of functionality added by this plugin
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:229
 msgid "Mail marking"
 msgstr ""
 
+#. TRANSLATORS: Heading of a preferences section determining which headers to add
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:92
 msgid "Add fetchinfo headers"
 msgstr ""
@@ -9997,15 +10113,13 @@ msgstr ""
 msgid "Headers to be added"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
-msgid "UIDL"
-msgstr ""
-
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:104
 msgid ""
 "Adds the X-FETCH-UIDL header with the unique ID listing of message (POP3)"
 msgstr ""
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:106
 msgid "Account name"
 msgstr ""
@@ -10014,6 +10128,7 @@ msgstr ""
 msgid "Adds the X-FETCH-ACCOUNT header with the account name"
 msgstr ""
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:108
 msgid "Receive server"
 msgstr ""
@@ -10022,6 +10137,7 @@ msgstr ""
 msgid "Adds the X-FETCH-SERVER header with the receive server"
 msgstr ""
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:110
 msgid "UserID"
 msgstr ""
@@ -10030,6 +10146,7 @@ msgstr ""
 msgid "Adds the X-FETCH-USERID header with the user ID"
 msgstr ""
 
+#. TRANSLATORS: Description of a header to be added
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:112
 msgid "Fetch time"
 msgstr ""
@@ -10131,7 +10248,7 @@ msgstr "GData plugin: Starting interactive authorisation\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:483
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr "GData plugin: Got authorization code, requesting authorisation\n"
+msgstr "GData plugin: Got authorisation code, requesting authorisation\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:490
 msgid ""
@@ -10174,7 +10291,7 @@ msgid "Authentication"
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1569
+#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
 msgid "Username:"
 msgstr ""
 
@@ -10214,6 +10331,35 @@ msgstr ""
 msgid "GData integration"
 msgstr ""
 
+#: src/plugins/keyword_warner/keyword_warner.c:189
+#, c-format
+msgid ""
+"A keyword is used in the mail you are sending. The keyword appears on line "
+"%d, which begins with the text: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/plugins/keyword_warner/keyword_warner.c:195
+msgid "Keyword warning"
+msgstr ""
+
+#: src/plugins/keyword_warner/keyword_warner.c:260
+#: src/plugins/keyword_warner/keyword_warner.c:313
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:235
+msgid "Keyword Warner"
+msgstr ""
+
+#: src/plugins/keyword_warner/keyword_warner.c:270
+msgid ""
+"Shows a warning when sending or queueing a message and a reference to one or "
+"more keywords is found in the message text."
+msgstr ""
+
+#: src/plugins/keyword_warner/keyword_warner_prefs.c:138
+msgid "Don't check for keywords when forwarding or redirecting messages"
+msgstr ""
+
 #: src/plugins/libravatar/libravatar.c:334
 #: src/plugins/libravatar/libravatar.c:399
 #: src/plugins/libravatar/libravatar.c:459
@@ -10319,7 +10465,7 @@ msgid "Cache refresh interval"
 msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:238
-#: src/plugins/vcalendar/vcal_prefs.c:322 src/prefs_account.c:1663
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1663
 #: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr ""
@@ -10475,15 +10621,15 @@ msgid ""
 "litehtml.com/)."
 msgstr ""
 
-#: src/plugins/mailmbox/plugin.c:58
+#: src/plugins/mailmbox/plugin.c:57
 msgid "mailmbox folder"
 msgstr ""
 
-#: src/plugins/mailmbox/plugin.c:63
+#: src/plugins/mailmbox/plugin.c:62
 msgid "This is a plugin to handle mailboxes in mbox format."
 msgstr ""
 
-#: src/plugins/mailmbox/plugin.c:84
+#: src/plugins/mailmbox/plugin.c:83
 msgid "MBOX"
 msgstr ""
 
@@ -10494,77 +10640,70 @@ msgid ""
 "scanned automatically."
 msgstr ""
 
-#: src/plugins/mailmbox/plugin_gtk.c:331
-#, c-format
-msgid ""
-"All folders and messages under '%s' will be deleted.\n"
-"Do you really want to delete?"
-msgstr ""
-
-#: src/plugins/managesieve/managesieve.c:436
+#: src/plugins/managesieve/managesieve.c:438
 msgid "No Sieve auth method available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:440
+#: src/plugins/managesieve/managesieve.c:442
 msgid "Selected Sieve auth method not available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:673
+#: src/plugins/managesieve/managesieve.c:675
 msgid "Disconnected"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:677
+#: src/plugins/managesieve/managesieve.c:679
 #, c-format
 msgid "Disconnected: %s"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:726
-#: src/plugins/managesieve/managesieve.c:871
+#: src/plugins/managesieve/managesieve.c:728
+#: src/plugins/managesieve/managesieve.c:873
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:733
+#: src/plugins/managesieve/managesieve.c:735
 msgid "STARTTLS failed"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:798
-#: src/plugins/managesieve/managesieve.c:814
-#: src/plugins/managesieve/managesieve.c:841
-#: src/plugins/managesieve/managesieve.c:923
-#: src/plugins/managesieve/managesieve.c:941
+#: src/plugins/managesieve/managesieve.c:800
+#: src/plugins/managesieve/managesieve.c:816
+#: src/plugins/managesieve/managesieve.c:843
+#: src/plugins/managesieve/managesieve.c:925
+#: src/plugins/managesieve/managesieve.c:943
 msgid "error occurred on SIEVE session\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:867
+#: src/plugins/managesieve/managesieve.c:869
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:876
+#: src/plugins/managesieve/managesieve.c:878
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1153
+#: src/plugins/managesieve/managesieve.c:1160
 msgid "Sieve: retrying auth\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1155
+#: src/plugins/managesieve/managesieve.c:1162
 msgid "Auth method not available"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1172
+#: src/plugins/managesieve/managesieve.c:1179
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5810
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
 msgid "_Filter"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "Chec_k Syntax"
 msgstr ""
 
@@ -10573,7 +10712,7 @@ msgid "Re_vert"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_editor.c:725
 #: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr ""
@@ -10594,29 +10733,29 @@ msgstr ""
 msgid "_Revert"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:353
+#: src/plugins/managesieve/sieve_editor.c:354
 msgid "Script saved successfully."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:370
+#: src/plugins/managesieve/sieve_editor.c:371
 msgid "Saving..."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:399
+#: src/plugins/managesieve/sieve_editor.c:400
 msgid "Checking syntax..."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:433
+#: src/plugins/managesieve/sieve_editor.c:434
 msgid "This script has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:695
+#: src/plugins/managesieve/sieve_editor.c:696
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#: src/plugins/managesieve/sieve_editor.c:745
+#: src/plugins/pdf_viewer/poppler_viewer.c:1331
 msgid "Loading..."
 msgstr ""
 
@@ -10666,24 +10805,24 @@ msgstr ""
 msgid "Manage Sieve Filters"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:771
+#: src/plugins/managesieve/sieve_manager.c:772
 msgid "_Rename"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:806
+#: src/plugins/managesieve/sieve_manager.c:807
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_plugin.c:36
-#: src/plugins/managesieve/sieve_plugin.c:154
+#: src/plugins/managesieve/sieve_plugin.c:38
+#: src/plugins/managesieve/sieve_plugin.c:156
 msgid "ManageSieve"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_plugin.c:46
+#: src/plugins/managesieve/sieve_plugin.c:48
 msgid "Manage Sieve Filters..."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_plugin.c:114
+#: src/plugins/managesieve/sieve_plugin.c:116
 msgid "Manage sieve filters on a server using the ManageSieve protocol."
 msgstr ""
 
@@ -10728,7 +10867,7 @@ msgid "Require STARTTLS"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:267
 msgid "No authentication"
 msgstr ""
 
@@ -10741,19 +10880,18 @@ msgid "Specify authentication"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:236
-#: src/plugins/vcalendar/vcal_prefs.c:390
-#: src/plugins/vcalendar/vcal_prefs.c:509 src/prefs_account.c:1432
+#: src/plugins/vcalendar/vcal_prefs.c:392
+#: src/plugins/vcalendar/vcal_prefs.c:511 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:398
-#: src/plugins/vcalendar/vcal_prefs.c:517 src/prefs_account.c:1437
+#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:400
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1437
 #: src/prefs_account.c:2060 src/prefs_account.c:2998 src/prefs_account.c:3026
-#: src/prefs_account.c:3221 src/prefs_proxy.c:132 src/wizard.c:1221
-#: src/wizard.c:1651
+#: src/prefs_account.c:3221 src/prefs_proxy.c:134
 msgid "Password"
 msgstr ""
 
@@ -10764,7 +10902,7 @@ msgstr ""
 
 #: 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:1120
+#: src/prefs_themes.c:1219
 msgid "Automatic"
 msgstr ""
 
@@ -10780,20 +10918,20 @@ msgstr ""
 msgid "Sieve"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
+#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
 msgid "NewMail"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:112
+#: src/plugins/newmail/newmail.c:113
 msgid "Failed to register newmail hook"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:129
+#: src/plugins/newmail/newmail.c:130
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:142
+#: src/plugins/newmail/newmail.c:143
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10804,11 +10942,11 @@ msgid ""
 "Current log is %s"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:176
+#: src/plugins/newmail/newmail.c:177
 msgid "Log file"
 msgstr ""
 
-#: src/plugins/notification/notification_banner.c:358
+#: src/plugins/notification/notification_banner.c:360
 msgid "Folder:"
 msgstr ""
 
@@ -10816,7 +10954,7 @@ msgstr ""
 msgid "Select folder(s)"
 msgstr ""
 
-#: src/plugins/notification/notification_foldercheck.c:583
+#: src/plugins/notification/notification_foldercheck.c:581
 msgid "select recursively"
 msgstr ""
 
@@ -10825,55 +10963,51 @@ msgid "No new messages"
 msgstr ""
 
 #: 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
+#: src/plugins/notification/notification_plugin.c:418
+#: src/plugins/notification/notification_prefs.c:402
+#: src/plugins/notification/notification_prefs.c:418
+#: src/plugins/notification/notification_prefs.c:437
+#: src/plugins/notification/notification_prefs.c:455
+#: src/plugins/notification/notification_prefs.c:473
+#: src/plugins/notification/notification_prefs.c:491
+#: src/plugins/notification/notification_prefs.c:509
+#: src/plugins/notification/notification_prefs.c:527
 msgid "Notification"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:225
-msgid "The Notification plugin needs threading support."
-msgstr ""
-
-#: src/plugins/notification/notification_plugin.c:232
+#: src/plugins/notification/notification_plugin.c:226
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:240
+#: src/plugins/notification/notification_plugin.c:234
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:250
+#: src/plugins/notification/notification_plugin.c:244
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:260
+#: src/plugins/notification/notification_plugin.c:254
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:271
+#: src/plugins/notification/notification_plugin.c:265
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:284
+#: src/plugins/notification/notification_plugin.c:278
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:297
+#: src/plugins/notification/notification_plugin.c:291
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:310
+#: src/plugins/notification/notification_plugin.c:304
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:429
+#: src/plugins/notification/notification_plugin.c:423
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -10882,8 +11016,14 @@ msgid ""
 "\n"
 "Feedback to <berndth@gmx.de> is welcome."
 msgstr ""
+"This plugin provides various ways to notify the user of new and unread "
+"email.\n"
+"The plugin is extensively configurable in the plugins section of the "
+"preferences dialogue.\n"
+"\n"
+"Feedback to <berndth@gmx.de> is welcome."
 
-#: src/plugins/notification/notification_plugin.c:454
+#: src/plugins/notification/notification_plugin.c:448
 msgid "Various tools"
 msgstr ""
 
@@ -10976,243 +11116,243 @@ msgid_plural "%d new messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_prefs.c:421
+#: src/plugins/notification/notification_prefs.c:419
 msgid "Hotkeys"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:440
+#: src/plugins/notification/notification_prefs.c:438
 msgid "Banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:458
+#: src/plugins/notification/notification_prefs.c:456
 msgid "Popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:476 src/prefs_actions.c:265
+#: src/plugins/notification/notification_prefs.c:474 src/prefs_actions.c:264
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:494
+#: src/plugins/notification/notification_prefs.c:492
 msgid "LCD"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:512
+#: src/plugins/notification/notification_prefs.c:510
 msgid "SysTrayicon"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:530
+#: src/plugins/notification/notification_prefs.c:528
 msgid "Indicator"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:613
+#: src/plugins/notification/notification_prefs.c:611
 msgid "Include folder types"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:622
+#: src/plugins/notification/notification_prefs.c:620
 msgid "Mail folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:630
+#: src/plugins/notification/notification_prefs.c:628
 msgid "News folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:638
+#: src/plugins/notification/notification_prefs.c:636
 msgid "RSSyl folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:646
+#: src/plugins/notification/notification_prefs.c:644
 msgid "vCalendar folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:654
+#: src/plugins/notification/notification_prefs.c:652
 msgid "These settings override folder-specific selections."
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:665
+#: src/plugins/notification/notification_prefs.c:663
 msgid "Global notification settings"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:674
+#: src/plugins/notification/notification_prefs.c:672
 msgid "Set window manager urgency hint when new messages exist"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:683
+#: src/plugins/notification/notification_prefs.c:681
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:693
+#: src/plugins/notification/notification_prefs.c:691
 msgid "Use sound theme"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:765
+#: src/plugins/notification/notification_prefs.c:763
 msgid "Show banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:770
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/plugins/notification/notification_prefs.c:768
+#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:772 src/prefs_receive.c:229
-#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
+#: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
+#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
 msgid "Always"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:774
+#: src/plugins/notification/notification_prefs.c:772
 msgid "Only when not empty"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:793
+#: src/plugins/notification/notification_prefs.c:791
 msgid "Banner speed"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:830
+#: src/plugins/notification/notification_prefs.c:828
 msgid "Maximum number of messages"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:836
+#: src/plugins/notification/notification_prefs.c:834
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:845
+#: src/plugins/notification/notification_prefs.c:843
 msgid "Banner width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:851
+#: src/plugins/notification/notification_prefs.c:849
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:853
+#: src/plugins/notification/notification_prefs.c:851
 msgid "pixel(s)"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:862
+#: src/plugins/notification/notification_prefs.c:860
 msgid "Include unread mails in banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:870
+#: src/plugins/notification/notification_prefs.c:868
 msgid "Make banner sticky"
 msgstr ""
 
-#: 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
+#: src/plugins/notification/notification_prefs.c:878
+#: src/plugins/notification/notification_prefs.c:1073
+#: src/plugins/notification/notification_prefs.c:1364
+#: src/plugins/notification/notification_prefs.c:1599
 msgid "Only include selected folders"
 msgstr ""
 
-#: 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
+#: src/plugins/notification/notification_prefs.c:887
+#: src/plugins/notification/notification_prefs.c:1082
+#: src/plugins/notification/notification_prefs.c:1373
+#: src/plugins/notification/notification_prefs.c:1608
 msgid "Select folders..."
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:901
+#: src/plugins/notification/notification_prefs.c:899
 msgid "Banner colors"
 msgstr "Banner colours"
 
-#: src/plugins/notification/notification_prefs.c:905
-#: src/plugins/notification/notification_prefs.c:1121
+#: src/plugins/notification/notification_prefs.c:903
+#: src/plugins/notification/notification_prefs.c:1114
 msgid "Use custom colors"
 msgstr "Use custom colours"
 
-#: src/plugins/notification/notification_prefs.c:920
-#: src/plugins/notification/notification_prefs.c:1135
+#: src/plugins/notification/notification_prefs.c:918
+#: src/plugins/notification/notification_prefs.c:1128
 msgid "Foreground"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:926
-#: src/plugins/notification/notification_prefs.c:1141
+#: src/plugins/notification/notification_prefs.c:922
+#: src/plugins/notification/notification_prefs.c:1134
 msgid "Foreground color"
 msgstr "Foreground colour"
 
-#: src/plugins/notification/notification_prefs.c:931
-#: src/plugins/notification/notification_prefs.c:1147
+#: src/plugins/notification/notification_prefs.c:927
+#: src/plugins/notification/notification_prefs.c:1140
 #: src/prefs_msg_colors.c:251 src/prefs_msg_colors.c:265
 #: src/prefs_msg_colors.c:279
 msgid "Background"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:937
-#: src/plugins/notification/notification_prefs.c:1153
+#: src/plugins/notification/notification_prefs.c:931
+#: src/plugins/notification/notification_prefs.c:1146
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/plugins/notification/notification_prefs.c:1044
-#: src/plugins/notification/notification_prefs.c:1641
+#: src/plugins/notification/notification_prefs.c:1037
+#: src/plugins/notification/notification_prefs.c:1634
 msgid "Enable popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1061
-#: src/plugins/notification/notification_prefs.c:1659
+#: src/plugins/notification/notification_prefs.c:1054
+#: src/plugins/notification/notification_prefs.c:1652
 msgid "Popup timeout"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1100
+#: src/plugins/notification/notification_prefs.c:1093
 msgid "Make popup sticky"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1110
+#: src/plugins/notification/notification_prefs.c:1103
 msgid "Set popup window width and position"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1115
+#: src/plugins/notification/notification_prefs.c:1108
 msgid "(the window manager is free to ignore this)"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1165
-#: src/plugins/notification/notification_prefs.c:1671
+#: src/plugins/notification/notification_prefs.c:1158
+#: src/plugins/notification/notification_prefs.c:1664
 msgid "Display folder name"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1224
+#: src/plugins/notification/notification_prefs.c:1217
 msgid "Sample popup window"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1230
+#: src/plugins/notification/notification_prefs.c:1223
 msgid "Done"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1288
+#: src/plugins/notification/notification_prefs.c:1281
 msgid "Select command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1317
+#: src/plugins/notification/notification_prefs.c:1310
 msgid "Enable command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1334 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1327 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1352
+#: src/plugins/notification/notification_prefs.c:1345
 msgid "Block command after execution for"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1459
+#: src/plugins/notification/notification_prefs.c:1452
 msgid "Enable LCD"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1478
+#: src/plugins/notification/notification_prefs.c:1471
 msgid "Hostname:Port of LCDd server"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1563
+#: src/plugins/notification/notification_prefs.c:1556
 msgid "Enable Trayicon"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1579
+#: src/plugins/notification/notification_prefs.c:1572
 msgid "Hide at start-up"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1587
+#: src/plugins/notification/notification_prefs.c:1580
 msgid "Close to tray"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1595
+#: src/plugins/notification/notification_prefs.c:1588
 msgid "Hide when iconified"
 msgstr ""
 
@@ -11222,36 +11362,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:1632
+#: src/plugins/notification/notification_prefs.c:1625
 msgid "Passive toaster popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1796
+#: src/plugins/notification/notification_prefs.c:1789
 msgid "Add to Indicator Applet"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1810
+#: src/plugins/notification/notification_prefs.c:1803
 msgid "Hide mainwindow when minimized"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1863
+#: src/plugins/notification/notification_prefs.c:1856
 msgid "Enable global hotkeys"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<control><shift>F11"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1877
+#: src/plugins/notification/notification_prefs.c:1870
 msgid "<alt>N"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1889
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "Toggle minimize"
 msgstr ""
 
@@ -11366,95 +11506,95 @@ msgstr ""
 msgid "Optimized:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1228
+#: src/plugins/pdf_viewer/poppler_viewer.c:1233
 msgid "PDF properties"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1377
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 msgid "Enter password"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1378
+#: src/plugins/pdf_viewer/poppler_viewer.c:1383
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1393
+#: src/plugins/pdf_viewer/poppler_viewer.c:1398
 #, c-format
 msgid "%s Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1399
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 #, c-format
 msgid "of %d"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1415
+#: src/plugins/pdf_viewer/poppler_viewer.c:1420
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1787
-#: src/plugins/pdf_viewer/poppler_viewer.c:1996
+#: src/plugins/pdf_viewer/poppler_viewer.c:1795
+#: src/plugins/pdf_viewer/poppler_viewer.c:2007
 msgid "Document Index"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "First Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Previous Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Next Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Last Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1973
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Zoom In"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Zoom Out"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Fit Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Fit Page Width"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Rotate Left"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1998
 msgid "Rotate Right"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:2001
 msgid "Print Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1993
+#: src/plugins/pdf_viewer/poppler_viewer.c:2004
 msgid "Document Info"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:2009
 msgid "Page Number"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2000
+#: src/plugins/pdf_viewer/poppler_viewer.c:2011
 msgid "Zoom Factor"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2111
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11463,13 +11603,13 @@ msgid ""
 "Any feedback is welcome: iwkse@claws-mail.org"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2117
-#: src/plugins/pdf_viewer/poppler_viewer.c:2125
-#: src/plugins/pdf_viewer/poppler_viewer.c:2145
+#: src/plugins/pdf_viewer/poppler_viewer.c:2128
+#: src/plugins/pdf_viewer/poppler_viewer.c:2136
+#: src/plugins/pdf_viewer/poppler_viewer.c:2156
 msgid "PDF Viewer"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2121
+#: src/plugins/pdf_viewer/poppler_viewer.c:2132
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11479,7 +11619,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/perl/perl_gtk.c:50
+#: src/plugins/perl/perl_gtk.c:48
 msgid "Edit perl filter rules (ext)..."
 msgstr ""
 
@@ -11496,23 +11636,23 @@ msgid "[no user id]"
 msgstr ""
 
 #: src/plugins/pgpcore/passphrase.c:260
-msgid "Please enter the passphrase for the new key:"
+msgid "Passphrases did not match.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:263
-msgid "Passphrases did not match.\n"
+#: src/plugins/pgpcore/passphrase.c:261
+msgid "Please enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:265
 msgid "Please re-enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:272
-msgid "Please enter the passphrase for:"
+#: src/plugins/pgpcore/passphrase.c:269
+msgid "Bad passphrase.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:275
-msgid "Bad passphrase.\n"
+#: src/plugins/pgpcore/passphrase.c:270
+msgid "Please enter the passphrase for:"
 msgstr ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:179
@@ -11528,7 +11668,7 @@ msgstr ""
 msgid "from keyserver"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:182
+#: src/plugins/pgpcore/pgp_viewer.c:183
 msgid "from Web Key Directory"
 msgstr ""
 
@@ -11634,7 +11774,7 @@ msgstr ""
 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/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:463
 #: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1827
 #: src/prefs_account.c:2126 src/prefs_receive.c:190
 msgid "minutes"
@@ -11694,8 +11834,8 @@ msgstr ""
 msgid "GPG"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:35
+#: src/plugins/smime/smime.c:1078
 msgid "S/MIME"
 msgstr ""
 
@@ -11709,54 +11849,54 @@ msgstr ""
 msgid "Collecting info for '%s' ... %c"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
-#: src/plugins/pgpcore/sgpgme.c:166
+#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
-#: src/plugins/pgpcore/sgpgme.c:170
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:412
 msgid "Select Keys"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:458
+#: src/plugins/pgpcore/select-keys.c:462
 msgid "Key ID"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:476
+#: src/plugins/pgpcore/select-keys.c:480
 msgid "Trust"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:495
+#: src/plugins/pgpcore/select-keys.c:499
 msgid "_Other"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:496
+#: src/plugins/pgpcore/select-keys.c:500
 msgid "Do_n't encrypt"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:677
+#: src/plugins/pgpcore/select-keys.c:681
 msgid "Add key"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:678
+#: src/plugins/pgpcore/select-keys.c:682
 msgid "Enter another user or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:700
+#: src/plugins/pgpcore/select-keys.c:704
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:701
+#: src/plugins/pgpcore/select-keys.c:705
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11768,228 +11908,227 @@ msgid ""
 "Do you trust this key enough to use it anyway?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
-#: src/privacy.c:270 src/privacy.c:274
+#: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:281 src/privacy.c:286
 msgid "No signature found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:164
+#: src/plugins/pgpcore/sgpgme.c:350
 msgid "Untrusted"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
+#: src/plugins/pgpcore/sgpgme.c:424 src/plugins/pgpcore/sgpgme.c:443
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
+#: src/plugins/pgpcore/sgpgme.c:428 src/plugins/pgpcore/sgpgme.c:432
 msgid "The signature has not been checked."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:252
+#: src/plugins/pgpcore/sgpgme.c:438
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:270
+#: src/plugins/pgpcore/sgpgme.c:456
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:273
+#: src/plugins/pgpcore/sgpgme.c:459
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:462
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:283
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
+#: src/plugins/pgpcore/sgpgme.c:471 src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:477
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:294
+#: src/plugins/pgpcore/sgpgme.c:480
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:483
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:300
+#: src/plugins/pgpcore/sgpgme.c:486
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:493
 msgid "The signature has not been checked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:330
+#: src/plugins/pgpcore/sgpgme.c:516
 msgid "Error checking signature: no status\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:535
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:553
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:559
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:564
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:569
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:574
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:392
+#: src/plugins/pgpcore/sgpgme.c:579
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:405
+#: src/plugins/pgpcore/sgpgme.c:591
 #, c-format
-msgid "uid \"%s\" (Validity: %s)\n"
+msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:593
 msgid "Revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:598
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:413
+#: src/plugins/pgpcore/sgpgme.c:599
 msgid "No key!"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:415
+#: src/plugins/pgpcore/sgpgme.c:601
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:433
+#: src/plugins/pgpcore/sgpgme.c:619
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:439
+#: src/plugins/pgpcore/sgpgme.c:625
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:473
+#: src/plugins/pgpcore/sgpgme.c:660
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:489
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:855
 msgid "Secret key specification is ambiguous"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:865
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:689
+#: src/plugins/pgpcore/sgpgme.c:878
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:782
+#: src/plugins/pgpcore/sgpgme.c:971
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:788
+#: src/plugins/pgpcore/sgpgme.c:977
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:796
+#: src/plugins/pgpcore/sgpgme.c:985
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:812
+#: src/plugins/pgpcore/sgpgme.c:1001
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:1078
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:894
+#: src/plugins/pgpcore/sgpgme.c:1083
 msgid "No PGP key found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:895
+#: src/plugins/pgpcore/sgpgme.c:1084
 msgid ""
 "Claws Mail did not find a secret PGP key, which means that you won't be able "
 "to sign emails or receive encrypted emails.\n"
 "Do you want to create a new key pair now?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
+#: src/plugins/pgpcore/sgpgme.c:1174 src/plugins/pgpcore/sgpgme.c:1196
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:994
+#: src/plugins/pgpcore/sgpgme.c:1184
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1012
+#: src/plugins/pgpcore/sgpgme.c:1202
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1016
+#: src/plugins/pgpcore/sgpgme.c:1206
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11998,130 +12137,117 @@ msgid ""
 "Do you want to export it to a keyserver?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1020
+#: src/plugins/pgpcore/sgpgme.c:1210
 msgid "Key generated"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1096
+#: src/plugins/pgpcore/sgpgme.c:1286
 msgid "Key exported."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1098
+#: src/plugins/pgpcore/sgpgme.c:1288
 msgid "Couldn't export key."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:156
-msgid "Incorrect part"
-msgstr ""
-
-#: src/plugins/pgpinline/pgpinline.c:160
-msgid "Not a text part"
+#: src/plugins/pgpinline/pgpinline.c:385
+msgid "Couldn't parse mime part."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
+#: src/plugins/pgpinline/pgpinline.c:392
 msgid "Couldn't get text data."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:189
-msgid "Couldn't convert text data to any sane charset."
-msgstr ""
-
-#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
-#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
-#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
-#: src/plugins/smime/smime.c:418
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr ""
-
-#: src/plugins/pgpinline/pgpinline.c:316
-msgid "Couldn't parse mime part."
-msgstr ""
-
-#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
+#: src/plugins/pgpinline/pgpinline.c:423 src/plugins/pgpmime/pgpmime.c:262
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
-#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
-#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
-#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
+#: src/plugins/pgpinline/pgpinline.c:442 src/plugins/pgpinline/pgpinline.c:451
+#: src/plugins/pgpinline/pgpinline.c:460 src/plugins/pgpinline/pgpinline.c:468
+#: src/plugins/pgpinline/pgpinline.c:478 src/plugins/pgpinline/pgpinline.c:487
+#: src/plugins/pgpmime/pgpmime.c:274 src/plugins/pgpmime/pgpmime.c:289
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
-#: src/plugins/pgpinline/pgpinline.c:379
+#: src/plugins/pgpinline/pgpinline.c:456 src/plugins/pgpinline/pgpinline.c:457
+#: src/plugins/pgpinline/pgpinline.c:458
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
-#: src/plugins/pgpinline/pgpinline.c:397
+#: src/plugins/pgpinline/pgpinline.c:474 src/plugins/pgpinline/pgpinline.c:475
+#: src/plugins/pgpinline/pgpinline.c:476
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
+#: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpmime/pgpmime.c:302
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:428
+#: src/plugins/pgpinline/pgpinline.c:509
 msgid "Couldn't scan decrypted file."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:436
+#: src/plugins/pgpinline/pgpinline.c:518
 msgid "Couldn't scan decrypted file parts."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
+#: src/plugins/pgpinline/pgpinline.c:575 src/plugins/pgpinline/pgpinline.c:770
 msgid "Malformed message"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
-#: src/plugins/pgpmime/pgpmime.c:696
+#: src/plugins/pgpinline/pgpinline.c:586 src/plugins/pgpinline/pgpinline.c:784
+#: src/plugins/pgpmime/pgpmime.c:614
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
+#: src/plugins/pgpinline/pgpinline.c:601 src/plugins/pgpinline/pgpinline.c:740
+#: src/plugins/pgpinline/pgpinline.c:805 src/plugins/pgpmime/pgpmime.c:230
+#: src/plugins/pgpmime/pgpmime.c:425 src/plugins/pgpmime/pgpmime.c:569
+#: src/plugins/smime/smime.c:559
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:625 src/plugins/pgpmime/pgpmime.c:452
 #, c-format
 msgid "Data signing failed, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
+#: src/plugins/pgpinline/pgpinline.c:643 src/plugins/pgpmime/pgpmime.c:479
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
+#: src/plugins/pgpinline/pgpinline.c:652 src/plugins/pgpmime/pgpmime.c:488
 msgid "Data signing failed, no results."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
+#: src/plugins/pgpinline/pgpinline.c:662 src/plugins/pgpmime/pgpmime.c:499
 msgid "Data signing failed, no contents."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:624
+#: src/plugins/pgpinline/pgpinline.c:706
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
+#: src/plugins/pgpinline/pgpinline.c:751 src/plugins/pgpmime/pgpmime.c:580
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
+#: src/plugins/pgpinline/pgpinline.c:823 src/plugins/pgpmime/pgpmime.c:649
 #, c-format
 msgid "Encryption failed, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:796
+#: src/plugins/pgpinline/pgpinline.c:892
 msgid "PGP/Inline"
 msgstr ""
 
@@ -12144,34 +12270,30 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:204
-msgid "Signature boundary not found."
-msgstr ""
-
-#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
+#: src/plugins/pgpmime/pgpmime.c:314 src/plugins/smime/smime.c:653
 msgid "Couldn't parse decrypted file."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
+#: src/plugins/pgpmime/pgpmime.c:322 src/plugins/smime/smime.c:661
 msgid "Couldn't parse decrypted file parts."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
+#: src/plugins/pgpmime/pgpmime.c:369 src/plugins/pgpmime/pgpmime.c:408
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:599
+#: src/plugins/pgpmime/pgpmime.c:513
 msgid "OpenPGP digital signature"
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:622
+#: src/plugins/pgpmime/pgpmime.c:536
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:798
+#: src/plugins/pgpmime/pgpmime.c:723
 msgid "PGP/Mime"
 msgstr ""
 
@@ -12203,26 +12325,26 @@ msgid "Show Python console..."
 msgstr ""
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:471
+#: src/plugins/rssyl/rssyl_feed_props.c:470
 msgid "Refresh"
 msgstr ""
 
 #: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3443 src/wizard.c:1211
-#: src/wizard.c:1641
+#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: src/wizard.c:1659
 msgid "Browse"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:673
-#: src/plugins/python/python_plugin.c:760
+#: src/plugins/python/python_plugin.c:635
+#: src/plugins/python/python_plugin.c:722
 msgid "Python"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:682
+#: src/plugins/python/python_plugin.c:644
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:765
+#: src/plugins/python/python_plugin.c:727
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12269,11 +12391,11 @@ msgid ""
 "Feedback to <berndth@gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:816
+#: src/plugins/python/python_plugin.c:778
 msgid "Python integration"
 msgstr ""
 
-#: src/plugins/rssyl/old_feeds.c:90
+#: src/plugins/rssyl/old_feeds.c:92
 #, c-format
 msgid ""
 "Couldn't read contents of old feeds.xml file:\n"
@@ -12326,40 +12448,40 @@ msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
+#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
 msgid "Refresh all feeds"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 msgid "Subscribe feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:67
+#: src/plugins/rssyl/rssyl_cb_menu.c:100
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:136
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
 #: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:321
+#: src/plugins/rssyl/rssyl_cb_menu.c:359
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:322
+#: src/plugins/rssyl/rssyl_cb_menu.c:360
 msgid "Remove feed tree"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_cb_menu.c:395
 msgid "Select an OPML file"
 msgstr ""
 
@@ -12403,100 +12525,100 @@ msgstr ""
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:270
+#: src/plugins/rssyl/rssyl_feed_props.c:269
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:292
+#: src/plugins/rssyl/rssyl_feed_props.c:291
 msgid "Use default refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:304
+#: src/plugins/rssyl/rssyl_feed_props.c:303
 msgid "Keep old items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:310
+#: src/plugins/rssyl/rssyl_feed_props.c:309
 msgid "_Trim"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:311
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:315
+#: src/plugins/rssyl/rssyl_feed_props.c:314
 msgid "Fetch comments if possible"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:335
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Always mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:336
 msgid "Only mark it as new if its text has changed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:338
 msgid "Never mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:344
+#: src/plugins/rssyl/rssyl_feed_props.c:343
 msgid "Add item title to the top of message"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:350
 msgid "Ignore title rename"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:360
-#: src/plugins/vcalendar/vcal_prefs.c:592
+#: src/plugins/rssyl/rssyl_feed_props.c:359
+#: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:380
+#: src/plugins/rssyl/rssyl_feed_props.c:379
 msgid "User name"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/rssyl/rssyl_feed_props.c:392
 msgid "Source URL"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:406
+#: src/plugins/rssyl/rssyl_feed_props.c:405
 msgid "Fetch comments on posts aged less than"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
-#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:710
-#: src/prefs_account.c:1653 src/prefs_folder_item.c:569 src/prefs_matcher.c:340
+#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/vcalendar/day-view.c:620 src/plugins/vcalendar/month-view.c:709
+#: src/prefs_account.c:1653 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:415
+#: src/plugins/rssyl/rssyl_feed_props.c:414
 msgid "Set to -1 to fetch all comments"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:439
+#: src/plugins/rssyl/rssyl_feed_props.c:438
 msgid "If an item changes"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:444
+#: src/plugins/rssyl/rssyl_feed_props.c:443
 msgid "Items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:457
+#: src/plugins/rssyl/rssyl_feed_props.c:456
 msgid "Refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:465
+#: src/plugins/rssyl/rssyl_feed_props.c:464
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:517
+#: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "Set feed properties"
 msgstr ""
 
@@ -12606,13 +12728,13 @@ msgstr ""
 msgid "_Edit feed properties after subscribing"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_comments.c:107
+#: src/plugins/rssyl/rssyl_update_comments.c:109
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1627
+#: src/plugins/vcalendar/vcal_folder.c:1628
 msgid "401 (Authorisation required)"
 msgstr ""
 
@@ -12621,7 +12743,7 @@ msgid "403 (Forbidden)"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1633
+#: src/plugins/vcalendar/vcal_folder.c:1634
 msgid "404 (Not found)"
 msgstr ""
 
@@ -12680,7 +12802,7 @@ msgid ""
 "Please report this, with debug output attached.\n"
 msgstr ""
 
-#: src/plugins/smime/plugin.c:59
+#: src/plugins/smime/plugin.c:61
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
@@ -12700,44 +12822,44 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 
-#: src/plugins/smime/smime.c:426
+#: src/plugins/smime/smime.c:567
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr ""
 
-#: src/plugins/smime/smime.c:454
+#: src/plugins/smime/smime.c:603
 msgid "Couldn't open temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
+#: src/plugins/smime/smime.c:615 src/plugins/smime/smime.c:631
 msgid "Couldn't write to temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:491
+#: src/plugins/smime/smime.c:643
 msgid "Couldn't close temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:714
+#: src/plugins/smime/smime.c:867
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:313
+#: src/plugins/spam_report/spam_report.c:312
 msgid "Reporting spam..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:348
+#: src/plugins/spam_report/spam_report.c:347
 msgid "Report spam online..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:359
-#: src/plugins/spam_report/spam_report.c:397
+#: src/plugins/spam_report/spam_report.c:358
+#: src/plugins/spam_report/spam_report.c:396
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:402
+#: src/plugins/spam_report/spam_report.c:401
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12747,7 +12869,7 @@ msgid ""
 " * lists.debian.org nomination system"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:427
+#: src/plugins/spam_report/spam_report.c:426
 msgid "Spam reporting"
 msgstr ""
 
@@ -12759,7 +12881,8 @@ msgstr ""
 msgid "Forward to:"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1582
+#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr ""
 
@@ -12797,15 +12920,15 @@ msgid ""
 "learner."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:561
+#: src/plugins/spamassassin/spamassassin.c:565
 msgid "Failed to get username"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:578
+#: src/plugins/spamassassin/spamassassin.c:582
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:612
+#: src/plugins/spamassassin/spamassassin.c:616
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -12894,29 +13017,29 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:131
-#: src/plugins/tnef_parse/tnef_parse.c:138
+#: src/plugins/tnef_parse/tnef_parse.c:134
+#: src/plugins/tnef_parse/tnef_parse.c:142
 msgid "Failed to write the part data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:183
+#: src/plugins/tnef_parse/tnef_parse.c:187
 msgid "Failed to parse VCalendar data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:222
+#: src/plugins/tnef_parse/tnef_parse.c:226
 msgid "Failed to parse VTask data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:274
+#: src/plugins/tnef_parse/tnef_parse.c:278
 msgid "Failed to parse VCard data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:414
-#: src/plugins/tnef_parse/tnef_parse.c:438
+#: src/plugins/tnef_parse/tnef_parse.c:418
+#: src/plugins/tnef_parse/tnef_parse.c:442
 msgid "TNEF Parser"
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:443
+#: src/plugins/tnef_parse/tnef_parse.c:447
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -12924,115 +13047,115 @@ msgid ""
 "Hand <yerase@yerot.com>"
 msgstr ""
 
-#: src/plugins/vcalendar/common-views.c:62
+#: src/plugins/vcalendar/common-views.c:61
 msgid "_Edit this meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/common-views.c:63
+#: src/plugins/vcalendar/common-views.c:62
 msgid "_Cancel this meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/common-views.c:65
+#: src/plugins/vcalendar/common-views.c:64
 msgid "_Create new meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/common-views.c:67
+#: src/plugins/vcalendar/common-views.c:66
 msgid "_Go to today"
 msgstr ""
 
-#: src/plugins/vcalendar/day-view.c:591 src/plugins/vcalendar/month-view.c:689
+#: src/plugins/vcalendar/day-view.c:599 src/plugins/vcalendar/month-view.c:688
 msgid "Start"
 msgstr ""
 
-#: src/plugins/vcalendar/day-view.c:604 src/plugins/vcalendar/month-view.c:702
+#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:701
 msgid "Show"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:109
+#: src/plugins/vcalendar/month-view.c:108
 msgid "Monday"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:110
+#: src/plugins/vcalendar/month-view.c:109
 msgid "Tuesday"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:111
+#: src/plugins/vcalendar/month-view.c:110
 msgid "Wednesday"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:112
+#: src/plugins/vcalendar/month-view.c:111
 msgid "Thursday"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:113
+#: src/plugins/vcalendar/month-view.c:112
 msgid "Friday"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:114
+#: src/plugins/vcalendar/month-view.c:113
 msgid "Saturday"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:115
+#: src/plugins/vcalendar/month-view.c:114
 msgid "Sunday"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:118
+#: src/plugins/vcalendar/month-view.c:117
 msgid "January"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:119
+#: src/plugins/vcalendar/month-view.c:118
 msgid "February"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:120
+#: src/plugins/vcalendar/month-view.c:119
 msgid "March"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:121
+#: src/plugins/vcalendar/month-view.c:120
 msgid "April"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:122
+#: src/plugins/vcalendar/month-view.c:121
 msgid "May"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:123
+#: src/plugins/vcalendar/month-view.c:122
 msgid "June"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:124
+#: src/plugins/vcalendar/month-view.c:123
 msgid "July"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:125
+#: src/plugins/vcalendar/month-view.c:124
 msgid "August"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:126
+#: src/plugins/vcalendar/month-view.c:125
 msgid "September"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:127
+#: src/plugins/vcalendar/month-view.c:126
 msgid "October"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:128
+#: src/plugins/vcalendar/month-view.c:127
 msgid "November"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:129
+#: src/plugins/vcalendar/month-view.c:128
 msgid "December"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:790
+#: src/plugins/vcalendar/month-view.c:789
 msgid "Week number"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:875
+#: src/plugins/vcalendar/month-view.c:874
 msgid "Previous month"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:894
+#: src/plugins/vcalendar/month-view.c:893
 msgid "Next month"
 msgstr ""
 
@@ -13093,7 +13216,7 @@ msgstr ""
 
 #: 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
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:712
 msgid "Details follow:"
 msgstr ""
 
@@ -13117,117 +13240,117 @@ msgstr ""
 msgid "(this event recurs)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:562
 msgid "(this event is part of a recurring event)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:714
+#: src/plugins/vcalendar/vcalendar.c:711
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:718
+#: src/plugins/vcalendar/vcalendar.c:715
 #, 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:797
+#: src/plugins/vcalendar/vcalendar.c:796
 msgid "Error - could not get the calendar MIME part."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:804
+#: src/plugins/vcalendar/vcalendar.c:803
 msgid "Error - no calendar part found."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:818
+#: src/plugins/vcalendar/vcalendar.c:817
 msgid "Error - Unknown calendar component type."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:950
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:959
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1055
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1058
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Answer"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1192
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Edit meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1193
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Cancel meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1194
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "Launch website"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1198
+#: src/plugins/vcalendar/vcalendar.c:1199
 msgid "You are already busy at this time."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1237
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1626
+#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
 msgid "Event:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1238
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: src/plugins/vcalendar/vcalendar.c:1239
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1607
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1611
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1621
 msgid "Location:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1240
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1616
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1620
 msgid "Summary:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Starting:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1242
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Ending:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1244
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
+#: src/plugins/vcalendar/vcalendar.c:1245
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1623
 msgid "Attendees:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1246
+#: src/plugins/vcalendar/vcalendar.c:1247
 msgid "Action:"
 msgstr ""
 
@@ -13267,48 +13390,48 @@ msgstr ""
 msgid "Meetings"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1502
+#: src/plugins/vcalendar/vcal_folder.c:1503
 msgid "in the past"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1505
+#: src/plugins/vcalendar/vcal_folder.c:1506
 msgid "today"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1508
+#: src/plugins/vcalendar/vcal_folder.c:1509
 msgid "tomorrow"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1511
+#: src/plugins/vcalendar/vcal_folder.c:1512
 msgid "this week"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1514
+#: src/plugins/vcalendar/vcal_folder.c:1515
 msgid "later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1518
+#: src/plugins/vcalendar/vcal_folder.c:1519
 #, c-format
 msgid ""
 "\n"
 "These are the events planned %s:\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1618
+#: src/plugins/vcalendar/vcal_folder.c:1619
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1630
+#: src/plugins/vcalendar/vcal_folder.c:1631
 msgid "403 (Unauthorised)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1636
+#: src/plugins/vcalendar/vcal_folder.c:1637
 #, c-format
 msgid "Error %ld"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1821
+#: src/plugins/vcalendar/vcal_folder.c:1813
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13317,7 +13440,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1852
+#: src/plugins/vcalendar/vcal_folder.c:1844
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13325,46 +13448,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1883
-#: src/plugins/vcalendar/vcal_folder.c:1886
+#: src/plugins/vcalendar/vcal_folder.c:1875
+#: src/plugins/vcalendar/vcal_folder.c:1878
 #, c-format
 msgid "Could not create directory %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1926
+#: src/plugins/vcalendar/vcal_folder.c:1918
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1937
+#: src/plugins/vcalendar/vcal_folder.c:1929
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1938
+#: src/plugins/vcalendar/vcal_folder.c:1930
 msgid "new subscription"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1949
+#: src/plugins/vcalendar/vcal_folder.c:1941
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1961
+#: src/plugins/vcalendar/vcal_folder.c:1986
 msgid "Subscribe to Webcal"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1961
+#: src/plugins/vcalendar/vcal_folder.c:1986
 msgid "Enter the Webcal URL:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1973
+#: src/plugins/vcalendar/vcal_folder.c:2002
 msgid "Could not parse the URL."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:2001
+#: src/plugins/vcalendar/vcal_folder.c:2030
 msgid "Do you really want to unsubscribe?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2031
 msgid "Delete subscription"
 msgstr ""
 
@@ -13568,7 +13691,7 @@ msgid "available"
 msgstr ""
 
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:848
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1101
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1105
 msgid "Free/busy retrieval failed"
 msgstr ""
 
@@ -13580,92 +13703,92 @@ msgstr ""
 msgid "Send anyway"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:942
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:943
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1083
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1110
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1114
 msgid "Available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1123
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1130
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1127
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1134
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1142
 msgid "Everyone is available."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1139
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1143
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1311
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1315
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1389
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1393
 msgid "Save & Send"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1390
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1394
 msgid "Check availability"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1484
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1488
 msgid "Starts at:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1490
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1514 src/prefs_matcher.c:768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1494
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1518 src/prefs_matcher.c:768
 msgid "on:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1508
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1512
 msgid "Ends at:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1549
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1553
 msgid "New meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1551
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1555
 #, c-format
 msgid "%s - Edit meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1610
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1634
 msgid "Time:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1757
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1756
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1760
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1767
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Upcoming event: %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1772
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -13676,125 +13799,125 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
 #, 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:1911
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1915
 msgid "Empty calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1912
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1916
 msgid "There is nothing to export."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1956
 msgid "Could not export the calendar."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1979
 msgid "Export calendar to ICS"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1992
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1996
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2108
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2112
 msgid "Could not export the freebusy info."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2140
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2144
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:299
+#: src/plugins/vcalendar/vcal_prefs.c:301
 msgid "Reminders"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:308
+#: src/plugins/vcalendar/vcal_prefs.c:310
 msgid "Alert me"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:337
+#: src/plugins/vcalendar/vcal_prefs.c:339
 msgid "minutes before an event"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:360
+#: src/plugins/vcalendar/vcal_prefs.c:362
 msgid "Calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:371
+#: src/plugins/vcalendar/vcal_prefs.c:373
 msgid "Automatically export calendar to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
-#: src/plugins/vcalendar/vcal_prefs.c:499
+#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:501
 msgid "You can export to a local file or URL"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:382
+#: src/plugins/vcalendar/vcal_prefs.c:384
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:412
+#: src/plugins/vcalendar/vcal_prefs.c:414
 msgid "Include Webcal subscriptions in export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:422
+#: src/plugins/vcalendar/vcal_prefs.c:424
 msgid "Command to run after calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:451
+#: src/plugins/vcalendar/vcal_prefs.c:453
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:453
+#: src/plugins/vcalendar/vcal_prefs.c:455
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:466
+#: src/plugins/vcalendar/vcal_prefs.c:468
 msgid "Export as GNOME shell calendar server"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:468
+#: src/plugins/vcalendar/vcal_prefs.c:470
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:478
+#: src/plugins/vcalendar/vcal_prefs.c:480
 msgid "Free/Busy information"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:490
+#: src/plugins/vcalendar/vcal_prefs.c:492
 msgid "Automatically export free/busy status to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:501
+#: src/plugins/vcalendar/vcal_prefs.c:503
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:531
+#: src/plugins/vcalendar/vcal_prefs.c:533
 msgid "Command to run after free/busy status export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:558
+#: src/plugins/vcalendar/vcal_prefs.c:560
 msgid "Get free/busy status of others from"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:566
+#: src/plugins/vcalendar/vcal_prefs.c:568
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
 "left part of the email address, %d for the domain"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:580
+#: src/plugins/vcalendar/vcal_prefs.c:582
 msgid "TLS options"
 msgstr ""
 
@@ -13854,7 +13977,7 @@ msgid "POP"
 msgstr ""
 
 #: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
-#: src/wizard.c:1508
+#: src/wizard.c:1516
 msgid "IMAP"
 msgstr ""
 
@@ -13862,7 +13985,7 @@ msgstr ""
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:398 src/wizard.c:1509
+#: src/prefs_account.c:398 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr ""
 
@@ -13890,11 +14013,11 @@ msgstr ""
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1294 src/wizard.c:1531
+#: src/prefs_account.c:1294 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1296 src/wizard.c:1532
+#: src/prefs_account.c:1296 src/wizard.c:1541
 msgid "Cancel"
 msgstr ""
 
@@ -14045,7 +14168,7 @@ msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
 #: 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
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr ""
 
@@ -14117,7 +14240,7 @@ msgstr "Authorisation code"
 
 #: src/prefs_account.c:2324
 msgid "Paste complete URL from browser or the provided authorization token"
-msgstr ""
+msgstr "Paste complete URL from browser or the provided authorisation token"
 
 #: src/prefs_account.c:2331
 msgid "Complete authorization"
@@ -14151,30 +14274,30 @@ msgstr ""
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1101
-#: src/prefs_spelling.c:150
+#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_spelling.c:149
 msgid "Default dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2558 src/prefs_folder_item.c:1132
-#: src/prefs_spelling.c:159
+#: src/prefs_account.c:2558 src/prefs_folder_item.c:1193
+#: src/prefs_spelling.c:158
 msgid "Default alternate dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2643 src/prefs_account.c:4109
-#: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1516
-#: src/prefs_folder_item.c:1881 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:312 src/prefs_wrapping.c:152
+#: src/prefs_account.c:2643 src/prefs_account.c:4116
+#: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1592
+#: src/prefs_folder_item.c:1957 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:308 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr ""
 
-#: src/prefs_account.c:2658 src/prefs_folder_item.c:1544 src/prefs_quote.c:134
-#: src/toolbar.c:490
+#: src/prefs_account.c:2658 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/toolbar.c:500
 msgid "Reply"
 msgstr ""
 
 #: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
-#: src/prefs_folder_item.c:1572 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
 msgid "Forward"
 msgstr ""
 
@@ -14182,11 +14305,11 @@ msgstr ""
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1168
+#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1198
+#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr ""
 
@@ -14256,7 +14379,7 @@ msgstr ""
 msgid "Turn this off if you have TLS connection problems"
 msgstr ""
 
-#: src/prefs_account.c:3159 src/prefs_proxy.c:73
+#: src/prefs_account.c:3159 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr ""
 
@@ -14271,11 +14394,11 @@ msgstr ""
 msgid "Use global proxy server settings"
 msgstr ""
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:115 src/wizard.c:1117
+#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr ""
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:123
+#: src/prefs_account.c:3212 src/prefs_proxy.c:125
 msgid "Username"
 msgstr ""
 
@@ -14289,278 +14412,278 @@ msgid ""
 "outgoing server, bypassing any configured proxy server."
 msgstr ""
 
-#: src/prefs_account.c:3353
+#: src/prefs_account.c:3354
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:3360
+#: src/prefs_account.c:3361
 msgid "POP port"
 msgstr ""
 
-#: src/prefs_account.c:3367
+#: src/prefs_account.c:3368
 msgid "IMAP port"
 msgstr ""
 
-#: src/prefs_account.c:3374
+#: src/prefs_account.c:3375
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:3380
+#: src/prefs_account.c:3381
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:3383
+#: src/prefs_account.c:3384
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:3397
+#: src/prefs_account.c:3398
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:3406
+#: src/prefs_account.c:3407
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
-#: src/prefs_account.c:3455
+#: src/prefs_account.c:3456
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3458
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:3459
+#: src/prefs_account.c:3460
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:3461
+#: src/prefs_account.c:3462
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:3518
+#: src/prefs_account.c:3519
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3522
+#: src/prefs_account.c:3523
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3530
+#: src/prefs_account.c:3531
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3535
+#: src/prefs_account.c:3536
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3540
+#: src/prefs_account.c:3541
 msgid "POP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3560
+#: src/prefs_account.c:3561
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:3566
+#: src/prefs_account.c:3567
 msgid "IMAP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3572
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3577
+#: src/prefs_account.c:3578
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3583
+#: src/prefs_account.c:3584
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3593
+#: src/prefs_account.c:3594
 msgid "User ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3598
+#: src/prefs_account.c:3601
 msgid "Password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3629
+#: src/prefs_account.c:3636
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3634
+#: src/prefs_account.c:3641
 msgid "SMTP password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3726
+#: src/prefs_account.c:3733
 msgid "domain is not specified."
 msgstr ""
 
-#: src/prefs_account.c:3731
+#: src/prefs_account.c:3738
 msgid "sent folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3736
+#: src/prefs_account.c:3743
 msgid "queue folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3741
+#: src/prefs_account.c:3748
 msgid "draft folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3746
+#: src/prefs_account.c:3753
 msgid "trash folder is not selected."
 msgstr "wastebin folder is not selected."
 
-#: src/prefs_account.c:4055
+#: src/prefs_account.c:4062
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:4091
+#: src/prefs_account.c:4098
 msgid "OAuth2"
 msgstr ""
 
-#: src/prefs_account.c:4127 src/prefs_folder_item.c:1897 src/prefs_quote.c:238
+#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_account.c:4145
+#: src/prefs_account.c:4152
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:4275
+#: src/prefs_account.c:4272
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:4630
+#: src/prefs_account.c:4632
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4634
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:4744 src/wizard.c:1398
+#: src/prefs_account.c:4746 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:4829
+#: src/prefs_account.c:4831
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:4847 src/prefs_account.c:4864 src/wizard.c:1065
+#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4960
+#: src/prefs_account.c:4962
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:5280
+#: src/prefs_account.c:5282
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
 
-#: src/prefs_actions.c:227
+#: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr ""
 
-#: src/prefs_actions.c:254
+#: src/prefs_actions.c:253
 msgid "Menu name"
 msgstr ""
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:282
 msgid "Shell command"
 msgstr ""
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:292
 msgid "Filter action"
 msgstr ""
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:298
 msgid "Edit filter action"
 msgstr ""
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:326
 msgid "Append the new action above to the list"
 msgstr ""
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:334
 msgid "Replace the selected action in list with the action above"
 msgstr ""
 
-#: src/prefs_actions.c:343
+#: src/prefs_actions.c:342
 msgid "Delete the selected action from the list"
 msgstr ""
 
-#: src/prefs_actions.c:351 src/prefs_filtering.c:485 src/prefs_template.c:330
+#: src/prefs_actions.c:350 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:359
+#: src/prefs_actions.c:358
 msgid "Show information on configuring actions"
 msgstr ""
 
-#: src/prefs_actions.c:384 src/prefs_filtering.c:510 src/prefs_template.c:356
+#: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:356
 msgid "_Top"
 msgstr ""
 
-#: src/prefs_actions.c:390
+#: src/prefs_actions.c:389
 msgid "Move the selected action to the top"
 msgstr ""
 
-#: src/prefs_actions.c:400
+#: src/prefs_actions.c:399
 msgid "Move the selected action up"
 msgstr ""
 
-#: src/prefs_actions.c:408
+#: src/prefs_actions.c:407
 msgid "Move selected action down"
 msgstr ""
 
-#: src/prefs_actions.c:412 src/prefs_filtering.c:558 src/prefs_template.c:384
+#: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
 msgid "_Bottom"
 msgstr ""
 
-#: src/prefs_actions.c:418
+#: src/prefs_actions.c:417
 msgid "Move the selected action to the bottom"
 msgstr ""
 
-#: src/prefs_actions.c:551 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_actions.c:550 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:822 src/prefs_filtering.c:824
+#: src/prefs_filtering.c:825 src/prefs_filtering.c:935 src/prefs_matcher.c:918
 #: src/prefs_template.c:465
 msgid "(New)"
 msgstr ""
 
-#: src/prefs_actions.c:616
+#: src/prefs_actions.c:615
 msgid "Menu name is not set."
 msgstr ""
 
-#: src/prefs_actions.c:621
+#: src/prefs_actions.c:620
 msgid "A leading '/' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:626
+#: src/prefs_actions.c:625
 msgid "Colon ':' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:644
 msgid "Menu name is too long."
 msgstr ""
 
-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:653
 msgid "Command-line not set."
 msgstr ""
 
-#: src/prefs_actions.c:659
+#: src/prefs_actions.c:658
 msgid "Menu name and command are too long."
 msgstr ""
 
-#: src/prefs_actions.c:665
+#: src/prefs_actions.c:664
 #, c-format
 msgid ""
 "The command\n"
@@ -14568,11 +14691,11 @@ msgid ""
 "has a syntax error."
 msgstr ""
 
-#: src/prefs_actions.c:723
+#: src/prefs_actions.c:722
 msgid "Delete action"
 msgstr ""
 
-#: src/prefs_actions.c:724
+#: src/prefs_actions.c:723
 msgid "Do you really want to delete this action?"
 msgstr ""
 
@@ -14584,152 +14707,164 @@ msgstr ""
 msgid "Do you really want to delete all the actions?"
 msgstr ""
 
-#: src/prefs_actions.c:912 src/prefs_actions.c:943 src/prefs_filtering.c:1485
-#: src/prefs_filtering.c:1507 src/prefs_matcher.c:2160 src/prefs_template.c:565
+#: src/prefs_actions.c:913 src/prefs_actions.c:944 src/prefs_filtering.c:1491
+#: src/prefs_filtering.c:1514 src/prefs_matcher.c:2165 src/prefs_template.c:565
 #: src/prefs_template.c:590
 msgid "Entry not saved"
 msgstr ""
 
-#: src/prefs_actions.c:913 src/prefs_actions.c:944 src/prefs_filtering.c:1486
-#: src/prefs_filtering.c:1508 src/prefs_template.c:566 src/prefs_template.c:591
+#: src/prefs_actions.c:914 src/prefs_actions.c:945 src/prefs_filtering.c:1492
+#: src/prefs_filtering.c:1515 src/prefs_template.c:566 src/prefs_template.c:591
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 
-#: src/prefs_actions.c:914 src/prefs_actions.c:919 src/prefs_actions.c:945
-#: 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_actions.c:915 src/prefs_actions.c:920 src/prefs_actions.c:946
+#: src/prefs_filtering.c:1469 src/prefs_filtering.c:1493
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:567
 #: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr ""
 
-#: src/prefs_actions.c:917
+#: src/prefs_actions.c:918
 msgid "Actions list not saved"
 msgstr ""
 
-#: src/prefs_actions.c:918
+#: src/prefs_actions.c:919
 msgid "The actions list has been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:989
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:990
 msgid "Use / in menu name to make submenus."
 msgstr ""
 
-#: src/prefs_actions.c:991
+#: src/prefs_actions.c:992
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:992
+#: src/prefs_actions.c:993
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:993
+#: src/prefs_actions.c:994
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:994
+#: src/prefs_actions.c:995
 msgid "to send user provided text to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:995
+#: src/prefs_actions.c:996
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:996
+#: src/prefs_actions.c:997
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:997
+#: src/prefs_actions.c:998
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 
-#: src/prefs_actions.c:998
+#: src/prefs_actions.c:999
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 
-#: src/prefs_actions.c:999
+#: src/prefs_actions.c:1000
 msgid "to run command asynchronously"
 msgstr ""
 
-#: src/prefs_actions.c:1000
+#: src/prefs_actions.c:1001
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:1002
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr ""
 
-#: src/prefs_actions.c:1002
+#: src/prefs_actions.c:1003
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 
-#: src/prefs_actions.c:1003
+#: src/prefs_actions.c:1004
 msgid "for the file of the selected decoded message MIME part"
 msgstr ""
 
-#: src/prefs_actions.c:1004
+#: src/prefs_actions.c:1005
 msgid "for a user provided argument"
 msgstr ""
 
-#: src/prefs_actions.c:1005
+#: src/prefs_actions.c:1006
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 
-#: src/prefs_actions.c:1006
+#: src/prefs_actions.c:1007
 msgid "for the text selection"
 msgstr ""
 
-#: src/prefs_actions.c:1007
+#: src/prefs_actions.c:1008
 msgid "apply filtering actions between {} to selected messages"
 msgstr ""
 
-#: src/prefs_actions.c:1008
+#: src/prefs_actions.c:1009
 msgid "for a literal %"
 msgstr ""
 
-#: src/prefs_actions.c:1018 src/prefs_themes.c:1096
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
 msgid "Actions"
 msgstr ""
 
-#: src/prefs_actions.c:1019
+#: src/prefs_actions.c:1020
 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:1106 src/prefs_filtering.c:1683
+#: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
 #: src/prefs_template.c:1107
 msgid "D_uplicate"
 msgstr ""
 
-#: src/prefs_actions.c:1224
+#: src/prefs_actions.c:1225
 msgid "Current actions"
 msgstr ""
 
-#: src/prefs_actions.c:1323 src/prefs_filtering.c:1060
-#: src/prefs_filtering.c:1118
+#: src/prefs_actions.c:1312
+msgid "Entry was modified"
+msgstr ""
+
+#: src/prefs_actions.c:1313
+msgid ""
+"Opening the filter action dialog will clear current modifications of the "
+"command-line."
+msgstr ""
+"Opening the filter action dialogue will clear current modifications of the "
+"command-line."
+
+#: src/prefs_actions.c:1324 src/prefs_filtering.c:1062
+#: src/prefs_filtering.c:1120
 msgid "Action string is not valid."
 msgstr ""
 
-#: src/prefs_common.c:239 src/prefs_quote.c:69
+#: src/prefs_common.c:238 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr ""
 
-#: src/prefs_common.c:317
+#: src/prefs_common.c:316
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr ""
 
-#: src/prefs_common.c:323 src/prefs_quote.c:85
+#: src/prefs_common.c:322 src/prefs_quote.c:85
 msgid ""
-"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
-"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
+"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: "
+"%t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
 
-#: src/prefs_common.c:458
+#: src/prefs_common.c:457
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -14778,7 +14913,7 @@ msgid "Warn when inserting a file larger than"
 msgstr ""
 
 #: src/prefs_compose_writing.c:205
-msgid "KB into message body "
+msgid "KiB into message body"
 msgstr ""
 
 #: src/prefs_compose_writing.c:211
@@ -14814,11 +14949,11 @@ msgstr ""
 msgid "Ask"
 msgstr ""
 
-#: src/prefs_compose_writing.c:240 src/toolbar.c:522
+#: src/prefs_compose_writing.c:240 src/toolbar.c:533
 msgid "Insert"
 msgstr ""
 
-#: src/prefs_compose_writing.c:241 src/toolbar.c:523
+#: src/prefs_compose_writing.c:241 src/toolbar.c:534
 msgid "Attach"
 msgstr ""
 
@@ -14831,7 +14966,7 @@ msgid "Custom header configuration"
 msgstr ""
 
 #: src/prefs_customheader.c:494 src/prefs_display_header.c:588
-#: src/prefs_matcher.c:1632 src/prefs_matcher.c:1647
+#: src/prefs_matcher.c:1634 src/prefs_matcher.c:1649
 msgid "Header name is not set."
 msgstr ""
 
@@ -14892,7 +15027,7 @@ msgstr ""
 msgid "Do you really want to delete this header?"
 msgstr ""
 
-#: src/prefs_customheader.c:865
+#: src/prefs_customheader.c:866
 msgid "Current custom headers"
 msgstr ""
 
@@ -14951,7 +15086,7 @@ msgid ""
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
 
-#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:173
+#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:172
 #: src/prefs_message.c:362
 msgid "Message View"
 msgstr ""
@@ -14975,8 +15110,8 @@ msgstr ""
 msgid "Message flags"
 msgstr ""
 
-#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:641
-#: src/prefs_summary_column.c:77 src/summaryview.c:2879 src/toolbar.c:505
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:77 src/summaryview.c:2884 src/toolbar.c:515
 msgid "Mark"
 msgstr ""
 
@@ -14997,11 +15132,11 @@ msgid "Mark as ham"
 msgstr ""
 
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2469
+#: src/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2510
 msgid "Execute"
 msgstr ""
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
 msgid "Color label"
 msgstr "Colour label"
 
@@ -15016,8 +15151,8 @@ msgstr ""
 
 #: 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:469
+#: src/prefs_summaries.c:646 src/prefs_summary_column.c:86
+#: src/summaryview.c:470
 msgid "Score"
 msgstr ""
 
@@ -15031,7 +15166,7 @@ msgstr ""
 
 #: 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
+#: src/prefs_summary_column.c:88 src/summaryview.c:472
 msgid "Tags"
 msgstr ""
 
@@ -15059,7 +15194,7 @@ msgstr ""
 msgid "Action configuration"
 msgstr ""
 
-#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1874
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1882
 #: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr ""
@@ -15100,25 +15235,25 @@ msgstr ""
 msgid "No action was defined."
 msgstr ""
 
-#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2207
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2213
 #: src/quote_fmt.c:78
 msgid "literal %"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2216
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2222
 msgid "filename (should not be modified)"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2217
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2223
 #: src/quote_fmt.c:86
 msgid "new line"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2218
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2224
 msgid "escape character for quotes"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2219
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2225
 msgid "quote character"
 msgstr ""
 
@@ -15157,8 +15292,8 @@ msgstr ""
 msgid "Filtering/Processing configuration"
 msgstr ""
 
-#: src/prefs_filtering.c:265 src/prefs_filtering.c:851
-#: src/prefs_filtering.c:967
+#: src/prefs_filtering.c:265 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:969
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr ""
@@ -15219,51 +15354,51 @@ msgstr ""
 msgid "Move the selected rule to the bottom"
 msgstr ""
 
-#: src/prefs_filtering.c:1024 src/prefs_filtering.c:1110
+#: src/prefs_filtering.c:1026 src/prefs_filtering.c:1112
 msgid "Condition string is not valid."
 msgstr ""
 
-#: src/prefs_filtering.c:1097
+#: src/prefs_filtering.c:1099
 msgid "Condition string is empty."
 msgstr ""
 
-#: src/prefs_filtering.c:1103
+#: src/prefs_filtering.c:1105
 msgid "Action string is empty."
 msgstr ""
 
-#: src/prefs_filtering.c:1192
+#: src/prefs_filtering.c:1194
 msgid "Delete rule"
 msgstr ""
 
-#: src/prefs_filtering.c:1193
+#: src/prefs_filtering.c:1195
 msgid "Do you really want to delete this rule?"
 msgstr ""
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1214
 msgid "Delete all rules"
 msgstr ""
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1215
 msgid "Do you really want to delete all the rules?"
 msgstr ""
 
-#: src/prefs_filtering.c:1463
+#: src/prefs_filtering.c:1467
 msgid "Filtering rules not saved"
 msgstr ""
 
-#: src/prefs_filtering.c:1464
+#: src/prefs_filtering.c:1468
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_filtering.c:1686
+#: src/prefs_filtering.c:1694
 msgid "Move one page up"
 msgstr ""
 
-#: src/prefs_filtering.c:1687
+#: src/prefs_filtering.c:1695
 msgid "Move one page down"
 msgstr ""
 
-#: src/prefs_filtering.c:1842
+#: src/prefs_filtering.c:1850
 msgid "Enable"
 msgstr ""
 
@@ -15281,155 +15416,166 @@ msgstr ""
 msgid "Hidden columns"
 msgstr ""
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
-#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
+#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr ""
 
 #: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:474
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1015
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1016
 msgid " Use default "
 msgstr ""
 
-#: src/prefs_folder_item.c:213
+#: src/prefs_folder_item.c:216
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\"."
 msgstr ""
 
-#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:900
+#: src/prefs_folder_item.c:300 src/prefs_folder_item.c:936
 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:316
+#: src/prefs_folder_item.c:323
 msgid "Normal"
 msgstr ""
 
-#: src/prefs_folder_item.c:318
+#: src/prefs_folder_item.c:325
 msgid "Outbox"
 msgstr ""
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr ""
 
-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:360
 msgid "Simplify Subject RegExp"
 msgstr ""
 
-#: src/prefs_folder_item.c:383
+#: src/prefs_folder_item.c:387
 msgid "Test string"
 msgstr ""
 
-#: src/prefs_folder_item.c:404
+#: src/prefs_folder_item.c:408
 msgid "Result"
 msgstr ""
 
-#: src/prefs_folder_item.c:422
+#: src/prefs_folder_item.c:426
 msgid "Folder chmod"
 msgstr ""
 
-#: src/prefs_folder_item.c:450
+#: src/prefs_folder_item.c:454
 msgid "Folder color"
 msgstr "Folder colour"
 
-#: src/prefs_folder_item.c:460 src/prefs_folder_item.c:464
+#: src/prefs_folder_item.c:464 src/prefs_folder_item.c:468
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 
-#: src/prefs_folder_item.c:477
+#: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
 msgstr ""
 
-#: src/prefs_folder_item.c:490
+#: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
 msgstr ""
 
-#: src/prefs_folder_item.c:502
+#: src/prefs_folder_item.c:505
 msgid "Scan for new mail"
 msgstr ""
 
-#: src/prefs_folder_item.c:504
+#: 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:520
+#: src/prefs_folder_item.c:524
 msgid "Select the HTML part of multipart messages"
 msgstr ""
 
-#: src/prefs_folder_item.c:535
+#: src/prefs_folder_item.c:539
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
 
-#: src/prefs_folder_item.c:543
+#: src/prefs_folder_item.c:549
+msgid "Skip folder when searching for unread or new messages"
+msgstr ""
+
+#: src/prefs_folder_item.c:551
+msgid ""
+"Turn this option on if you want this folder to be ignored when searching for "
+"unread or new messages"
+msgstr ""
+
+#: src/prefs_folder_item.c:563
 msgid "Synchronise for offline use"
 msgstr ""
 
-#: src/prefs_folder_item.c:561
+#: src/prefs_folder_item.c:582
 msgid "Fetch message bodies from the last"
 msgstr ""
 
-#: src/prefs_folder_item.c:566
+#: src/prefs_folder_item.c:587
 msgid "0: all bodies"
 msgstr ""
 
-#: src/prefs_folder_item.c:573
+#: src/prefs_folder_item.c:594
 msgid "Remove older messages bodies"
 msgstr ""
 
-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:612
 msgid "Discard folder cache"
 msgstr ""
 
-#: src/prefs_folder_item.c:907
+#: src/prefs_folder_item.c:943
 msgid "Request Return Receipt"
 msgstr ""
 
-#: src/prefs_folder_item.c:918
+#: src/prefs_folder_item.c:954
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 
-#: src/prefs_folder_item.c:929 src/prefs_folder_item.c:979
-#: src/prefs_folder_item.c:1004 src/prefs_folder_item.c:1029
+#: src/prefs_folder_item.c:965 src/prefs_folder_item.c:990
+#: src/prefs_folder_item.c:1040 src/prefs_folder_item.c:1065
+#: src/prefs_folder_item.c:1090
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr ""
 
-#: src/prefs_folder_item.c:954
+#: src/prefs_folder_item.c:1015
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr ""
 
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1114
 msgid "Default account"
 msgstr ""
 
-#: src/prefs_folder_item.c:1185 src/prefs_folder_item.c:1215
+#: src/prefs_folder_item.c:1247 src/prefs_folder_item.c:1278
 msgid "\"Default\" will follow the applicable account preference"
 msgstr ""
 
-#: src/prefs_folder_item.c:1748
+#: src/prefs_folder_item.c:1824
 msgid "Discard cache"
 msgstr ""
 
-#: src/prefs_folder_item.c:1749
+#: src/prefs_folder_item.c:1825
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
 
-#: src/prefs_folder_item.c:1864
+#: src/prefs_folder_item.c:1940
 msgid "General"
 msgstr ""
 
-#: src/prefs_folder_item.c:1943
+#: src/prefs_folder_item.c:2019
 #, c-format
 msgid "Properties for folder %s"
 msgstr ""
@@ -15438,7 +15584,7 @@ msgstr ""
 msgid "Folder and Message Lists"
 msgstr ""
 
-#: src/prefs_fonts.c:96 src/prefs_matcher.c:2081
+#: src/prefs_fonts.c:96 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr ""
 
@@ -15462,8 +15608,8 @@ msgstr ""
 msgid "Message Printing"
 msgstr ""
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:584 src/prefs_summaries.c:869
-#: src/prefs_themes.c:422
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_themes.c:426
 msgid "Display"
 msgstr ""
 
@@ -15471,47 +15617,47 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:910 src/toolbar.c:260 src/toolbar.c:528
 msgid "Preferences"
 msgstr ""
 
-#: src/prefs_image_viewer.c:77
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr ""
 
-#: src/prefs_image_viewer.c:81
+#: src/prefs_image_viewer.c:80
 msgid "Resize attached images by default"
 msgstr ""
 
-#: src/prefs_image_viewer.c:84
+#: src/prefs_image_viewer.c:83
 msgid "Clicking image toggles scaling"
 msgstr ""
 
-#: src/prefs_image_viewer.c:93
+#: src/prefs_image_viewer.c:92
 msgid "Fit image"
 msgstr ""
 
-#: src/prefs_image_viewer.c:97
+#: src/prefs_image_viewer.c:96
 msgid "Right-clicking image toggles fitting height/width"
 msgstr ""
 
-#: src/prefs_image_viewer.c:100
+#: src/prefs_image_viewer.c:99
 msgid "Height"
 msgstr ""
 
-#: src/prefs_image_viewer.c:106
+#: src/prefs_image_viewer.c:105
 msgid "Width"
 msgstr ""
 
-#: src/prefs_image_viewer.c:111
+#: src/prefs_image_viewer.c:110
 msgid "Display images inline"
 msgstr ""
 
-#: src/prefs_image_viewer.c:115
+#: src/prefs_image_viewer.c:114
 msgid "Print images"
 msgstr ""
 
-#: src/prefs_image_viewer.c:174
+#: src/prefs_image_viewer.c:173
 msgid "Image Viewer"
 msgstr ""
 
@@ -15672,11 +15818,11 @@ msgid "bytes"
 msgstr ""
 
 #: src/prefs_matcher.c:363
-msgid "kilobytes"
+msgid "kibibytes"
 msgstr ""
 
 #: src/prefs_matcher.c:364
-msgid "megabytes"
+msgid "mebibytes"
 msgstr ""
 
 #: src/prefs_matcher.c:368
@@ -15703,11 +15849,11 @@ msgstr ""
 msgid "whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6539
+#: src/prefs_matcher.c:402 src/summaryview.c:6551
 msgid "Marked"
 msgstr ""
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6537
+#: src/prefs_matcher.c:403 src/summaryview.c:6549
 msgid "Deleted"
 msgstr ""
 
@@ -15715,12 +15861,12 @@ msgstr ""
 msgid "Replied"
 msgstr ""
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6531
+#: src/prefs_matcher.c:405 src/summaryview.c:6543
 msgid "Forwarded"
 msgstr ""
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6521 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2343
+#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
+#: src/toolbar.c:1005 src/toolbar.c:2384
 msgid "Spam"
 msgstr ""
 
@@ -15728,7 +15874,7 @@ msgstr ""
 msgid "Has attachment"
 msgstr ""
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6557
+#: src/prefs_matcher.c:409 src/summaryview.c:6569
 msgid "Signed"
 msgstr ""
 
@@ -15834,8 +15980,8 @@ msgid ""
 "header if not available in the list."
 msgstr ""
 
-#: src/prefs_matcher.c:715 src/prefs_matcher.c:1653 src/prefs_matcher.c:1668
-#: src/prefs_matcher.c:2577
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1655 src/prefs_matcher.c:1670
+#: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr ""
@@ -15860,32 +16006,32 @@ msgstr ""
 msgid "of above rules"
 msgstr ""
 
-#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1637
+#: src/prefs_matcher.c:1561 src/prefs_matcher.c:1639
 msgid "Search pattern is not set."
 msgstr ""
 
-#: src/prefs_matcher.c:1574
+#: src/prefs_matcher.c:1575
 msgid "Invalid hour."
 msgstr ""
 
-#: src/prefs_matcher.c:1583
+#: src/prefs_matcher.c:1585
 msgid "Test command is not set."
 msgstr ""
 
-#: src/prefs_matcher.c:1654
+#: src/prefs_matcher.c:1656
 msgid "all addresses in all headers"
 msgstr ""
 
-#: src/prefs_matcher.c:1657
+#: src/prefs_matcher.c:1659
 msgid "any address in any header"
 msgstr ""
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr ""
 
-#: src/prefs_matcher.c:1660
+#: src/prefs_matcher.c:1662
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15894,97 +16040,97 @@ msgid ""
 "'%s' from the book/folder drop-down list."
 msgstr ""
 
-#: src/prefs_matcher.c:1879
+#: src/prefs_matcher.c:1884
 msgid "Headers part"
 msgstr ""
 
-#: src/prefs_matcher.c:1883
+#: src/prefs_matcher.c:1888
 msgid "Headers values"
 msgstr ""
 
-#: src/prefs_matcher.c:1887
+#: src/prefs_matcher.c:1892
 msgid "Body part"
 msgstr ""
 
-#: src/prefs_matcher.c:1891
+#: src/prefs_matcher.c:1896
 msgid "Whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:2008 src/prefs_matcher.c:2054
+#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
 msgid "in"
 msgstr ""
 
-#: src/prefs_matcher.c:2010
+#: src/prefs_matcher.c:2015
 msgid "content is"
 msgstr ""
 
-#: src/prefs_matcher.c:2014
+#: src/prefs_matcher.c:2019
 msgid "Date is"
 msgstr ""
 
-#: src/prefs_matcher.c:2025
+#: src/prefs_matcher.c:2030
 msgid "Age is"
 msgstr ""
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2035
 msgid "Flag"
 msgstr ""
 
-#: src/prefs_matcher.c:2031 src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
 msgstr ""
 
-#: src/prefs_matcher.c:2036
+#: src/prefs_matcher.c:2041
 msgid "Name:"
 msgstr ""
 
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2049
 msgid "Label"
 msgstr ""
 
-#: src/prefs_matcher.c:2049
+#: src/prefs_matcher.c:2054
 msgid "Value:"
 msgstr ""
 
-#: src/prefs_matcher.c:2064
+#: src/prefs_matcher.c:2069
 msgid "Score is"
 msgstr ""
 
-#: src/prefs_matcher.c:2065
+#: src/prefs_matcher.c:2070
 msgid "points"
 msgstr ""
 
-#: src/prefs_matcher.c:2075
+#: src/prefs_matcher.c:2080
 msgid "Size is"
 msgstr ""
 
-#: src/prefs_matcher.c:2080
+#: src/prefs_matcher.c:2085
 msgid "Scope:"
 msgstr ""
 
-#: src/prefs_matcher.c:2082
+#: src/prefs_matcher.c:2087
 msgid "tags"
 msgstr ""
 
-#: src/prefs_matcher.c:2087
+#: src/prefs_matcher.c:2092
 msgid "type is"
 msgstr ""
 
-#: src/prefs_matcher.c:2091
+#: src/prefs_matcher.c:2096
 msgid "Program returns"
 msgstr ""
 
-#: src/prefs_matcher.c:2161
+#: src/prefs_matcher.c:2166
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
 
-#: src/prefs_matcher.c:2228
+#: src/prefs_matcher.c:2234
 msgid "Match Type: 'Test'"
 msgstr ""
 
-#: src/prefs_matcher.c:2229
+#: src/prefs_matcher.c:2235
 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"
@@ -15992,7 +16138,7 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: src/prefs_matcher.c:2328
+#: src/prefs_matcher.c:2334
 msgid "Current condition rules"
 msgstr ""
 
@@ -16158,25 +16304,21 @@ msgid "Enable coloration of text background"
 msgstr "Enable colouration of text background"
 
 #: src/prefs_msg_colors.c:247
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Pick colour for 1st level text background"
 
 #: src/prefs_msg_colors.c:261
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Pick colour for 2nd level text background"
 
 #: src/prefs_msg_colors.c:275
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Pick colour for 3rd level text background"
 
 #: src/prefs_msg_colors.c:288
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for links"
 msgstr "Pick colour for links"
@@ -16186,7 +16328,6 @@ msgid "URI link"
 msgstr ""
 
 #: src/prefs_msg_colors.c:301
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for signatures"
 msgstr "Pick colour for signatures"
@@ -16198,7 +16339,6 @@ msgid "Patch messages and attachments"
 msgstr ""
 
 #: src/prefs_msg_colors.c:320
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for inserted lines"
 msgstr "Pick colour for inserted lines"
@@ -16208,7 +16348,6 @@ msgid "Inserted lines"
 msgstr ""
 
 #: src/prefs_msg_colors.c:330
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for removed lines"
 msgstr "Pick colour for removed lines"
@@ -16218,7 +16357,6 @@ msgid "Removed lines"
 msgstr ""
 
 #: src/prefs_msg_colors.c:342
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for hunk lines"
 msgstr "Pick colour for hunk lines"
@@ -16228,12 +16366,11 @@ msgstr "Pick colour for hunk lines"
 msgid "Hunk lines"
 msgstr ""
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
 msgid "Folder list"
 msgstr ""
 
 #: src/prefs_msg_colors.c:356
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for Target folder."
 msgstr "Pick colour for Target folder"
@@ -16250,7 +16387,6 @@ msgid ""
 msgstr ""
 
 #: src/prefs_msg_colors.c:370
-#, fuzzy
 msgctxt "Tooltip and Dialog title"
 msgid "Pick color for folders containing new messages"
 msgstr "Pick colour for folders containing new messages"
@@ -16280,7 +16416,7 @@ msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 
-#: src/prefs_msg_colors.c:585
+#: src/prefs_msg_colors.c:582
 msgid "Colors"
 msgstr "Colours"
 
@@ -16391,28 +16527,28 @@ msgid "Synchronise offline folders as soon as possible"
 msgstr ""
 
 #: src/prefs_other.c:604
-msgid "Master passphrase"
+msgid "Primary passphrase"
 msgstr ""
 
 #: src/prefs_other.c:607
-msgid "Use a master passphrase"
+msgid "Use a primary passphrase"
 msgstr ""
 
 #: 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."
+"If checked, your saved account passwords will be protected by a primary "
+"passphrase. If no primary passphrase is set, you will be prompted to set one."
 msgstr ""
 
 #: src/prefs_other.c:615
-msgid "Change master passphrase"
+msgid "Change primary passphrase"
 msgstr ""
 
 #: src/prefs_other.c:786
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/prefs_proxy.c:234 src/prefs_receive.c:415 src/prefs_send.c:411
+#: src/prefs_proxy.c:236 src/prefs_receive.c:415 src/prefs_send.c:411
 msgid "Mail Handling"
 msgstr ""
 
@@ -16654,306 +16790,312 @@ msgstr ""
 msgid "Sending"
 msgstr ""
 
-#: src/prefs_spelling.c:116
+#: src/prefs_spelling.c:115
 msgid "Enable spell checker"
 msgstr ""
 
-#: src/prefs_spelling.c:121
+#: src/prefs_spelling.c:120
 msgid "Enable alternate dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:126
+#: src/prefs_spelling.c:125
 msgid "Faster switching with last used dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:128
+#: src/prefs_spelling.c:127
 msgid "Automatic spell checking"
 msgstr ""
 
-#: src/prefs_spelling.c:136
+#: src/prefs_spelling.c:135
 msgid "Re-check message when changing dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:140
+#: src/prefs_spelling.c:139
 msgid "Dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:169
+#: src/prefs_spelling.c:168
 msgid "Check with both dictionaries"
 msgstr ""
 
-#: src/prefs_spelling.c:175
+#: src/prefs_spelling.c:174
 msgid "Get more dictionaries..."
 msgstr ""
 
-#: src/prefs_spelling.c:184
+#: src/prefs_spelling.c:182
 msgid "Misspelled word color"
 msgstr "Misspelled word colour:"
 
-#: src/prefs_spelling.c:194
+#: src/prefs_spelling.c:192
 msgid "Pick color for misspelled word"
 msgstr "Pick colour for misspelled word"
 
-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:197
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Pick colour for misspelled word. Use black to underline"
 
-#: src/prefs_spelling.c:313
+#: src/prefs_spelling.c:309
 msgid "Spell Checking"
 msgstr ""
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:164
 msgid "the abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:165
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:166
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:167
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:168
 msgid "the preferred date and time for the current locale"
 msgstr ""
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:169
 msgid "the century number (year/100)"
 msgstr ""
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:170
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:171
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:172
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:173
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:174
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:175
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:176
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:177
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:178
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:179
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_summaries.c:183
+#: src/prefs_summaries.c:180
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_summaries.c:184
+#: src/prefs_summaries.c:181
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:185
+#: src/prefs_summaries.c:182
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
-#: src/prefs_summaries.c:486
+#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
+#: src/prefs_summaries.c:488
 msgid "Date format"
 msgstr ""
 
-#: src/prefs_summaries.c:231
+#: src/prefs_summaries.c:228
 msgid "Specifier"
 msgstr ""
 
-#: src/prefs_summaries.c:273
+#: src/prefs_summaries.c:270
 msgid "Example"
 msgstr ""
 
-#: src/prefs_summaries.c:400
+#: src/prefs_summaries.c:398
 msgid "Display message count next to folder name"
 msgstr ""
 
-#: src/prefs_summaries.c:410
+#: src/prefs_summaries.c:408
 msgid "Unread messages"
 msgstr ""
 
-#: src/prefs_summaries.c:411
+#: src/prefs_summaries.c:409
 msgid "Unread and Total messages"
 msgstr ""
 
-#: src/prefs_summaries.c:417
+#: src/prefs_summaries.c:415
 msgid "Open last opened folder at start-up"
 msgstr ""
 
-#: src/prefs_summaries.c:424
+#: src/prefs_summaries.c:419
+msgid ""
+"Run processing rules before marking all messages in a folder as read or "
+"unread"
+msgstr ""
+
+#: src/prefs_summaries.c:426
 msgid "Abbreviate newsgroup names longer than"
 msgstr ""
 
-#: src/prefs_summaries.c:437
+#: src/prefs_summaries.c:439
 msgid "letters"
 msgstr ""
 
-#: src/prefs_summaries.c:445
+#: src/prefs_summaries.c:447
 msgid "Message list"
 msgstr ""
 
-#: src/prefs_summaries.c:462
+#: src/prefs_summaries.c:464
 msgid "Lock column headers"
 msgstr ""
 
-#: src/prefs_summaries.c:468
+#: src/prefs_summaries.c:470
 msgid "Displayed in From column"
 msgstr ""
 
-#: src/prefs_summaries.c:479
+#: src/prefs_summaries.c:481
 msgid "Name and Address"
 msgstr ""
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:507
 msgid "Date format help"
 msgstr ""
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:513
 msgid "Set message selection when entering a folder"
 msgstr ""
 
-#: src/prefs_summaries.c:520
+#: src/prefs_summaries.c:522
 msgid "Open message when selected"
 msgstr ""
 
-#: src/prefs_summaries.c:525
+#: src/prefs_summaries.c:527
 msgid "When opening a folder"
 msgstr ""
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:529
 msgid "When displaying search results"
 msgstr ""
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:531
 msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:533
 msgid "When deleting or moving messages"
 msgstr ""
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:535
 msgid "When using directional keys"
 msgstr ""
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:537
 msgid "Mark message as read"
 msgstr ""
 
-#: src/prefs_summaries.c:538
+#: src/prefs_summaries.c:540
 msgid "when selected, after"
 msgstr ""
 
-#: src/prefs_summaries.c:557
+#: src/prefs_summaries.c:559
 msgid "only when opened in a new window, or replied to"
 msgstr ""
 
-#: src/prefs_summaries.c:567
+#: src/prefs_summaries.c:569
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Show \"no unread (or new) message\" dialogue"
 
-#: src/prefs_summaries.c:577
+#: src/prefs_summaries.c:579
 msgid "Assume 'Yes'"
 msgstr ""
 
-#: src/prefs_summaries.c:578
+#: src/prefs_summaries.c:580
 msgid "Assume 'No'"
 msgstr ""
 
-#: src/prefs_summaries.c:584
+#: src/prefs_summaries.c:586
 msgid "Display sender using address book"
 msgstr ""
 
-#: src/prefs_summaries.c:588
+#: src/prefs_summaries.c:590
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 
-#: src/prefs_summaries.c:592
+#: src/prefs_summaries.c:594
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:596
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
 msgstr ""
 
-#: src/prefs_summaries.c:599
+#: src/prefs_summaries.c:601
 msgid "Confirm when marking all messages as read or unread"
 msgstr ""
 
-#: src/prefs_summaries.c:602
+#: src/prefs_summaries.c:604
 msgid "Confirm when changing color labels"
 msgstr "Confirm when changing colour labels"
 
-#: src/prefs_summaries.c:606
+#: src/prefs_summaries.c:608
 msgid "Show tooltips"
 msgstr ""
 
-#: src/prefs_summaries.c:616 src/quote_fmt.c:541
+#: src/prefs_summaries.c:618 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr ""
 
-#: src/prefs_summaries.c:618
+#: src/prefs_summaries.c:620
 msgid "New folders"
 msgstr ""
 
-#: src/prefs_summaries.c:624
+#: src/prefs_summaries.c:626
 msgid "Sort by"
 msgstr ""
 
-#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr ""
 
-#: src/prefs_summaries.c:635
+#: src/prefs_summaries.c:637
 msgid "Thread date"
 msgstr ""
 
-#: src/prefs_summaries.c:646
+#: src/prefs_summaries.c:648
 msgid "Don't sort"
 msgstr ""
 
-#: src/prefs_summaries.c:661
+#: src/prefs_summaries.c:663
 msgid "Thread view"
 msgstr ""
 
-#: src/prefs_summaries.c:664
+#: src/prefs_summaries.c:666
 msgid "Collapse all threads"
 msgstr ""
 
-#: src/prefs_summaries.c:670
+#: src/prefs_summaries.c:672
 msgid "Hide read messages"
 msgstr ""
 
-#: src/prefs_summaries.c:870
+#: src/prefs_summaries.c:877
 msgid "Summaries"
 msgstr ""
 
@@ -17122,67 +17264,67 @@ msgstr ""
 msgid "Template"
 msgstr ""
 
-#: src/prefs_themes.c:401 src/prefs_themes.c:845
+#: src/prefs_themes.c:405 src/prefs_themes.c:939
 msgid "Default internal theme"
 msgstr ""
 
-#: src/prefs_themes.c:423
+#: src/prefs_themes.c:427
 msgid "Themes"
 msgstr ""
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:504
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:502
+#: src/prefs_themes.c:506
 #, c-format
 msgid "Remove theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:511
 msgid "Are you sure you want to remove this theme?"
 msgstr ""
 
-#: src/prefs_themes.c:517
+#: src/prefs_themes.c:521
 #, c-format
 msgid ""
 "File %s failed\n"
 "while removing theme."
 msgstr ""
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:525
 msgid "Removing theme directory failed."
 msgstr ""
 
-#: src/prefs_themes.c:524
+#: src/prefs_themes.c:528
 msgid "Theme removed successfully"
 msgstr ""
 
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:548
 msgid "Select theme folder"
 msgstr ""
 
-#: src/prefs_themes.c:559
+#: src/prefs_themes.c:563
 #, c-format
 msgid "Install theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:562
+#: src/prefs_themes.c:566
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 
-#: src/prefs_themes.c:572
+#: src/prefs_themes.c:576
 msgid "Do you want to install theme for all users?"
 msgstr ""
 
-#: src/prefs_themes.c:592
+#: src/prefs_themes.c:596
 msgid "Theme exists"
 msgstr ""
 
-#: src/prefs_themes.c:593
+#: src/prefs_themes.c:597
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17190,169 +17332,177 @@ msgid ""
 "Do you want to replace it?"
 msgstr ""
 
-#: src/prefs_themes.c:600
+#: src/prefs_themes.c:604
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr ""
 
-#: src/prefs_themes.c:609
+#: src/prefs_themes.c:613
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr ""
 
-#: src/prefs_themes.c:623
+#: src/prefs_themes.c:627
 msgid "Theme installed successfully."
 msgstr ""
 
-#: src/prefs_themes.c:630
+#: src/prefs_themes.c:634
 msgid "Failed installing theme"
 msgstr ""
 
-#: src/prefs_themes.c:633
+#: src/prefs_themes.c:637
 #, c-format
 msgid ""
 "File %s failed\n"
 "while installing theme."
 msgstr ""
 
-#: src/prefs_themes.c:807
+#: src/prefs_themes.c:686
+msgid "View all theme icons"
+msgstr ""
+
+#: src/prefs_themes.c:901
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 
-#: src/prefs_themes.c:848
+#: src/prefs_themes.c:942
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr ""
 
-#: src/prefs_themes.c:854
+#: src/prefs_themes.c:948
 msgid "No info file available for this theme"
 msgstr ""
 
-#: src/prefs_themes.c:872
+#: src/prefs_themes.c:966
 msgid "Error: couldn't get theme status"
 msgstr ""
 
-#: src/prefs_themes.c:902
+#: src/prefs_themes.c:996
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr ""
 
-#: src/prefs_themes.c:960
+#: src/prefs_themes.c:1055
 msgid "Selector"
 msgstr ""
 
-#: src/prefs_themes.c:971
+#: src/prefs_themes.c:1066
 msgid "Install new..."
 msgstr ""
 
-#: src/prefs_themes.c:976
+#: src/prefs_themes.c:1071
 msgid "Get more..."
 msgstr ""
 
-#: src/prefs_themes.c:988
+#: src/prefs_themes.c:1083
 msgid "Information"
 msgstr ""
 
-#: src/prefs_themes.c:1003
+#: src/prefs_themes.c:1098
 msgid "Author"
 msgstr ""
 
-#: src/prefs_themes.c:1009
+#: src/prefs_themes.c:1104
 msgid "URL"
 msgstr ""
 
-#: src/prefs_themes.c:1047
+#: src/prefs_themes.c:1142
 msgid "Preview"
 msgstr ""
 
-#: src/prefs_themes.c:1111
+#: src/prefs_themes.c:1205
+msgid "View all"
+msgstr ""
+
+#: src/prefs_themes.c:1210
 msgid "SVG rendering"
 msgstr ""
 
-#: src/prefs_themes.c:1118
+#: src/prefs_themes.c:1217
 msgid "Enable alpha channel"
 msgstr ""
 
-#: src/prefs_themes.c:1119
+#: src/prefs_themes.c:1218
 msgid "Force scaling"
 msgstr ""
 
-#: src/prefs_themes.c:1125
+#: src/prefs_themes.c:1224
 msgid "Pixels per inch (PPI)"
 msgstr ""
 
-#: src/prefs_toolbar.c:186
+#: src/prefs_toolbar.c:187
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
 msgstr ""
 
-#: src/prefs_toolbar.c:187
+#: src/prefs_toolbar.c:188
 msgid "Item has no icon defined."
 msgstr ""
 
-#: src/prefs_toolbar.c:188
+#: src/prefs_toolbar.c:189
 msgid "Item has no text defined."
 msgstr ""
 
-#: src/prefs_toolbar.c:896
+#: src/prefs_toolbar.c:897
 msgid "Toolbar item"
 msgstr ""
 
-#: src/prefs_toolbar.c:913
+#: src/prefs_toolbar.c:914
 msgid "Item type"
 msgstr ""
 
-#: src/prefs_toolbar.c:921
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr ""
 
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr ""
 
-#: src/prefs_toolbar.c:924 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:283
 msgid "Separator"
 msgstr ""
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:930
 msgid "Event executed on click"
 msgstr ""
 
-#: src/prefs_toolbar.c:948
+#: src/prefs_toolbar.c:949
 msgid "Toolbar text"
 msgstr ""
 
-#: src/prefs_toolbar.c:961 src/prefs_toolbar.c:1336
+#: src/prefs_toolbar.c:962 src/prefs_toolbar.c:1338
 msgid "Icon"
 msgstr ""
 
-#: src/prefs_toolbar.c:1215 src/prefs_toolbar.c:1229 src/prefs_toolbar.c:1243
+#: src/prefs_toolbar.c:1216 src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244
 msgid "Toolbars"
 msgstr ""
 
-#: src/prefs_toolbar.c:1216
+#: src/prefs_toolbar.c:1217
 msgid "Main Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1230
+#: src/prefs_toolbar.c:1231
 msgid "Message Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1244
+#: src/prefs_toolbar.c:1245
 msgid "Compose Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1359
+#: src/prefs_toolbar.c:1361
 msgid "Icon text"
 msgstr ""
 
-#: src/prefs_toolbar.c:1368
+#: src/prefs_toolbar.c:1370
 msgid "Mapped event"
 msgstr ""
 
-#: src/prefs_toolbar.c:1675
+#: src/prefs_toolbar.c:1677
 msgid "Toolbar item icon"
 msgstr ""
 
@@ -17380,98 +17530,98 @@ msgstr ""
 msgid "Wrapping"
 msgstr ""
 
-#: src/printing.c:436
+#: src/printing.c:432
 msgid "Print preview"
 msgstr ""
 
-#: src/printing.c:480
+#: src/printing.c:476
 msgid "First page"
 msgstr ""
 
-#: src/printing.c:490
+#: src/printing.c:486
 msgid "Last page"
 msgstr ""
 
-#: src/printing.c:496
+#: src/printing.c:492
 msgid "Zoom 100%"
 msgstr ""
 
-#: src/printing.c:498
+#: src/printing.c:494
 msgid "Zoom fit"
 msgstr ""
 
-#: src/printing.c:500
+#: src/printing.c:496
 msgid "Zoom in"
 msgstr ""
 
-#: src/printing.c:502
+#: src/printing.c:498
 msgid "Zoom out"
 msgstr ""
 
-#: src/printing.c:700
+#: src/printing.c:677
 #, c-format
 msgid "Page %d"
 msgstr ""
 
-#: src/privacy.c:255 src/privacy.c:276
+#: src/privacy.c:289 src/privacy.c:293
 msgid "No information available"
 msgstr ""
 
-#: src/privacy.c:490
+#: src/privacy.c:507
 msgid "No recipient keys defined."
 msgstr ""
 
-#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
+#: src/procmime.c:414 src/procmime.c:416 src/procmime.c:417
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
-#: src/procmime.c:2802
+#: src/procmime.c:2836
 msgid "Could not decode part"
 msgstr ""
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:961 src/procmsg.c:964
 msgid "Already trying to send."
 msgstr ""
 
-#: src/procmsg.c:1563 src/procmsg.c:1624
+#: src/procmsg.c:1588 src/procmsg.c:1649
 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 
-#: src/procmsg.c:1634
+#: src/procmsg.c:1659
 msgid "Queued message header is broken."
 msgstr ""
 
-#: src/procmsg.c:1654
+#: src/procmsg.c:1679
 msgid "An error happened during SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1693
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1676
+#: src/procmsg.c:1701
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 
-#: src/procmsg.c:1699
+#: src/procmsg.c:1724
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1712
+#: src/procmsg.c:1737
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1726
+#: src/procmsg.c:1751
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 
-#: src/procmsg.c:2286
+#: src/procmsg.c:2311
 msgid "Filtering messages...\n"
 msgstr ""
 
@@ -17844,11 +17994,11 @@ msgid ""
 "If you're not sure, just select OK."
 msgstr ""
 
-#: src/sourcewindow.c:65
+#: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr ""
 
-#: src/sourcewindow.c:161
+#: src/sourcewindow.c:162
 #, c-format
 msgid "%s - Source"
 msgstr ""
@@ -17861,11 +18011,11 @@ msgstr ""
 msgid "Saved TLS certificates"
 msgstr ""
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:451
 msgid "Delete certificate"
 msgstr ""
 
-#: src/ssl_manager.c:447
+#: src/ssl_manager.c:452
 msgid "Do you really want to delete this certificate?"
 msgstr ""
 
@@ -17893,83 +18043,83 @@ msgstr ""
 msgid "Find _all"
 msgstr ""
 
-#: src/summary_search.c:696 src/summaryview.c:1135 src/summaryview.c:1398
+#: src/summary_search.c:696 src/summaryview.c:1138 src/summaryview.c:1402
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
 
-#: src/summary_search.c:791
+#: src/summary_search.c:792
 msgid "Beginning of list reached; continue from end?"
 msgstr ""
 
-#: src/summary_search.c:793
+#: src/summary_search.c:794
 msgid "End of list reached; continue from beginning?"
 msgstr ""
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "Re-edit"
 msgstr ""
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "Create _filter rule"
 msgstr ""
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "_Set displayed columns"
 msgstr ""
 
-#: src/summaryview.c:456
+#: src/summaryview.c:457
 msgid "_Lock column headers"
 msgstr ""
 
-#: src/summaryview.c:594
+#: src/summaryview.c:595
 msgid "Toggle quick search bar"
 msgstr ""
 
-#: src/summaryview.c:631
+#: src/summaryview.c:632
 msgid "Toggle multiple selection"
 msgstr ""
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1329
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:1327
+#: src/summaryview.c:1330
 msgid "Some marks are left. Process them?"
 msgstr ""
 
-#: src/summaryview.c:1377
+#: src/summaryview.c:1381
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 
-#: src/summaryview.c:1938 src/summaryview.c:1986
+#: src/summaryview.c:1935 src/summaryview.c:1984
 msgid "No more unread messages"
 msgstr ""
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1936
 msgid "No unread message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1951 src/summaryview.c:1999 src/summaryview.c:2036
-#: src/summaryview.c:2084 src/summaryview.c:2151
+#: src/summaryview.c:1949 src/summaryview.c:1998 src/summaryview.c:2036
+#: src/summaryview.c:2085 src/summaryview.c:2154
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
-#: src/summaryview.c:1963
+#: src/summaryview.c:1961
 msgid "No unread messages."
 msgstr ""
 
-#: src/summaryview.c:1987
+#: src/summaryview.c:1985
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2023 src/summaryview.c:2071
+#: src/summaryview.c:2022 src/summaryview.c:2071
 msgid "No more new messages"
 msgstr ""
 
-#: src/summaryview.c:2024
+#: src/summaryview.c:2023
 msgid "No new message found. Search from the end?"
 msgstr ""
 
@@ -17981,344 +18131,344 @@ msgstr ""
 msgid "No new message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2105 src/summaryview.c:2138
+#: src/summaryview.c:2106 src/summaryview.c:2140
 msgid "No more marked messages"
 msgstr ""
 
-#: src/summaryview.c:2106
+#: src/summaryview.c:2107
 msgid "No marked message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2115
+#: src/summaryview.c:2117
 msgid "No marked messages."
 msgstr ""
 
-#: src/summaryview.c:2139
+#: src/summaryview.c:2141
 msgid "No marked message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2172 src/summaryview.c:2201
+#: src/summaryview.c:2175 src/summaryview.c:2205
 msgid "No more labeled messages"
 msgstr "No more labelled messages"
 
-#: src/summaryview.c:2173
+#: src/summaryview.c:2176
 msgid "No labeled message found. Search from the end?"
 msgstr "No labelled message found. Search from the end?"
 
-#: src/summaryview.c:2182 src/summaryview.c:2215
+#: src/summaryview.c:2186 src/summaryview.c:2220
 msgid "No labeled messages."
 msgstr "No labelled messages."
 
-#: src/summaryview.c:2202
+#: src/summaryview.c:2206
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No labelled message found. Search from the beginning?"
 
-#: src/summaryview.c:2525
+#: src/summaryview.c:2530
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2713
+#: src/summaryview.c:2718
 #, c-format
 msgid "%d deleted"
 msgstr ""
 
-#: src/summaryview.c:2717
+#: src/summaryview.c:2722
 #, c-format
 msgid "%s%d moved"
 msgstr ""
 
-#: src/summaryview.c:2718 src/summaryview.c:2725
+#: src/summaryview.c:2723 src/summaryview.c:2730
 msgid ", "
 msgstr ""
 
-#: src/summaryview.c:2723
+#: src/summaryview.c:2728
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2737
+#: src/summaryview.c:2742
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:2755 src/summaryview.c:2800
+#: src/summaryview.c:2760 src/summaryview.c:2805
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr ""
 
-#: src/summaryview.c:2775
+#: src/summaryview.c:2780
 msgid "Message summary"
 msgstr ""
 
-#: src/summaryview.c:2776
+#: src/summaryview.c:2781
 msgid "New:"
 msgstr ""
 
-#: src/summaryview.c:2777
+#: src/summaryview.c:2782
 msgid "Unread:"
 msgstr ""
 
-#: src/summaryview.c:2778
+#: src/summaryview.c:2783
 msgid "Total:"
 msgstr ""
 
-#: src/summaryview.c:2780
+#: src/summaryview.c:2785
 msgid "Marked:"
 msgstr ""
 
-#: src/summaryview.c:2781
+#: src/summaryview.c:2786
 msgid "Replied:"
 msgstr ""
 
-#: src/summaryview.c:2782
+#: src/summaryview.c:2787
 msgid "Forwarded:"
 msgstr ""
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2788
 msgid "Locked:"
 msgstr ""
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2789
 msgid "Ignored:"
 msgstr ""
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2790
 msgid "Watched:"
 msgstr ""
 
-#: src/summaryview.c:2795
+#: src/summaryview.c:2800
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr ""
 
-#: src/summaryview.c:3083
+#: src/summaryview.c:3088
 msgid "Sorting summary..."
 msgstr ""
 
-#: src/summaryview.c:3255
+#: src/summaryview.c:3260
 msgid "Setting summary from message data..."
 msgstr ""
 
-#: src/summaryview.c:3461
+#: src/summaryview.c:3466
 msgid "(No Date)"
 msgstr ""
 
-#: src/summaryview.c:3518
+#: src/summaryview.c:3523
 msgid "(No Recipient)"
 msgstr ""
 
-#: src/summaryview.c:3566
+#: src/summaryview.c:3571
 #, c-format
 msgid "From: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:3575
+#: src/summaryview.c:3580
 #, c-format
 msgid "To: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:4460
+#: src/summaryview.c:4465
 msgid "You're not the author of the article."
 msgstr ""
 
-#: src/summaryview.c:4550
+#: src/summaryview.c:4555
 #, 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:4553
+#: src/summaryview.c:4558
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4717
+#: src/summaryview.c:4722
 msgid "Destination is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4772
+#: src/summaryview.c:4777
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4823
+#: src/summaryview.c:4828
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4857
+#: src/summaryview.c:4862
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:5015
+#: src/summaryview.c:5026
 msgid "Append or Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5016
+#: src/summaryview.c:5027
 msgid "Append or overwrite existing file?"
 msgstr ""
 
-#: src/summaryview.c:5017
+#: src/summaryview.c:5028
 msgid "_Append"
 msgstr ""
 
-#: src/summaryview.c:5017
+#: src/summaryview.c:5028
 msgid "_Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5028 src/summaryview.c:5031 src/summaryview.c:5046
+#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
-#: src/summaryview.c:5066
+#: src/summaryview.c:5080
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/summaryview.c:5524
+#: src/summaryview.c:5538
 msgid "Building threads..."
 msgstr ""
 
-#: src/summaryview.c:5772
+#: src/summaryview.c:5786
 msgid "Skip these rules"
 msgstr ""
 
-#: src/summaryview.c:5775
+#: src/summaryview.c:5789
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
-#: src/summaryview.c:5778
+#: src/summaryview.c:5792
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
-#: src/summaryview.c:5807
+#: src/summaryview.c:5821
 msgid "Filtering"
 msgstr ""
 
-#: src/summaryview.c:5808
+#: src/summaryview.c:5822
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
-#: src/summaryview.c:5840
+#: src/summaryview.c:5854
 msgid "Filtering..."
 msgstr ""
 
-#: src/summaryview.c:5923
+#: src/summaryview.c:5937
 msgid "Processing configuration"
 msgstr ""
 
-#: src/summaryview.c:6073
+#: src/summaryview.c:6087
 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:6075
+#: src/summaryview.c:6089
 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:6076
+#: src/summaryview.c:6090
 msgid "Reset color label"
 msgstr "Reset colour label"
 
-#: src/summaryview.c:6076
+#: src/summaryview.c:6090
 msgid "Set color label"
 msgstr "Set colour label"
 
-#: src/summaryview.c:6517
+#: src/summaryview.c:6529
 msgid "Ignored thread"
 msgstr ""
 
-#: src/summaryview.c:6519
+#: src/summaryview.c:6531
 msgid "Watched thread"
 msgstr ""
 
-#: src/summaryview.c:6527
+#: src/summaryview.c:6539
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6541
 msgid "Replied - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6553
 msgid "To be moved"
 msgstr ""
 
-#: src/summaryview.c:6543
+#: src/summaryview.c:6555
 msgid "To be copied"
 msgstr ""
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6567
 msgid "Signed, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6559
+#: src/summaryview.c:6571
 msgid "Encrypted, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6573
 msgid "Encrypted"
 msgstr ""
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6575
 msgid "Has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:8276
+#: src/summaryview.c:8298
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
-#: src/summaryview.c:8379
+#: src/summaryview.c:8401
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 
-#: src/summaryview.c:8384
+#: src/summaryview.c:8406
 msgid "Go back to the folder list"
 msgstr ""
 
-#: src/textview.c:218
+#: src/textview.c:241
 msgid "_Open in web browser"
 msgstr ""
 
-#: src/textview.c:219
+#: src/textview.c:242
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:226
+#: src/textview.c:249
 msgid "_Reply to this address"
 msgstr ""
 
-#: src/textview.c:227
+#: src/textview.c:250
 msgid "Add to _Address book"
 msgstr ""
 
-#: src/textview.c:228
+#: src/textview.c:251
 msgid "Copy this add_ress"
 msgstr ""
 
-#: src/textview.c:680
+#: src/textview.c:708
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr ""
 
-#: src/textview.c:683
+#: src/textview.c:711
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr ""
 
-#: src/textview.c:853
+#: src/textview.c:881
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18327,67 +18477,67 @@ msgid ""
 "  Use "
 msgstr ""
 
-#: src/textview.c:858
+#: src/textview.c:886
 msgid "'Network Log'"
 msgstr ""
 
-#: src/textview.c:859
+#: src/textview.c:887
 msgid " in the Tools menu for more information."
 msgstr ""
 
-#: src/textview.c:925
+#: src/textview.c:953
 msgid "  The following can be performed on this part\n"
 msgstr ""
 
-#: src/textview.c:927
+#: src/textview.c:955
 msgid "  by right-clicking the icon or list item:"
 msgstr ""
 
-#: src/textview.c:931
+#: src/textview.c:959
 msgid "     - To save, select "
 msgstr ""
 
-#: src/textview.c:932
+#: src/textview.c:960
 msgid "'Save as...'"
 msgstr ""
 
-#: src/textview.c:934 src/textview.c:946 src/textview.c:958 src/textview.c:968
+#: src/textview.c:962 src/textview.c:974 src/textview.c:986 src/textview.c:996
 msgid " (Shortcut key: '"
 msgstr ""
 
-#: src/textview.c:942
+#: src/textview.c:970
 msgid "     - To display as text, select "
 msgstr ""
 
-#: src/textview.c:943
+#: src/textview.c:971
 msgid "'Display as text'"
 msgstr ""
 
-#: src/textview.c:954
+#: src/textview.c:982
 msgid "     - To open with an external program, select "
 msgstr ""
 
-#: src/textview.c:955
+#: src/textview.c:983
 msgid "'Open'"
 msgstr ""
 
-#: src/textview.c:963
+#: src/textview.c:991
 msgid "       (alternately double-click, or click the middle "
 msgstr ""
 
-#: src/textview.c:964
+#: src/textview.c:992
 msgid "mouse button)\n"
 msgstr ""
 
-#: src/textview.c:966
+#: src/textview.c:994
 msgid "     - Or use "
 msgstr ""
 
-#: src/textview.c:967
+#: src/textview.c:995
 msgid "'Open with...'"
 msgstr ""
 
-#: src/textview.c:1089
+#: src/textview.c:1118
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18395,427 +18545,459 @@ msgid ""
 "Exit code %d\n"
 msgstr ""
 
-#: src/textview.c:2188
+#: src/textview.c:2229
 msgid "Tags: "
 msgstr ""
 
-#: src/textview.c:2905
-msgid "The real URL is different from the displayed URL."
+#: src/textview.c:2714
+msgid "Zoom _In"
 msgstr ""
 
-#: src/textview.c:2906
-msgid "Displayed URL:"
+#: src/textview.c:2723
+msgid "Zoom _Out"
 msgstr ""
 
-#: src/textview.c:2907
-msgid "Real URL:"
+#: src/textview.c:2732
+msgid "Reset _zoom"
+msgstr ""
+
+#: src/textview.c:3101
+msgid "Copy it anyway?"
 msgstr ""
 
-#: src/textview.c:2908
+#: src/textview.c:3101
 msgid "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2909
-msgid "Phishing attempt warning"
+#: src/textview.c:3102
+msgid "Co_py URL"
 msgstr ""
 
-#: src/textview.c:2910
+#: src/textview.c:3102
 msgid "_Open URL"
 msgstr ""
 
-#: src/toolbar.c:224 src/toolbar.c:2295
+#: src/textview.c:3108
+msgid "The real URL is different from the displayed URL."
+msgstr ""
+
+#: src/textview.c:3109
+msgid "Displayed URL:"
+msgstr ""
+
+#: src/textview.c:3110
+msgid "Real URL:"
+msgstr ""
+
+#: src/textview.c:3112
+msgid "Phishing attempt warning"
+msgstr ""
+
+#: src/toolbar.c:227 src/toolbar.c:2336
 msgid "Receive Mail from all Accounts"
 msgstr ""
 
-#: src/toolbar.c:225 src/toolbar.c:2300
+#: src/toolbar.c:228 src/toolbar.c:2341
 msgid "Receive Mail from current Account"
 msgstr ""
 
-#: src/toolbar.c:226 src/toolbar.c:2304
+#: src/toolbar.c:229 src/toolbar.c:2345
 msgid "Send Queued Messages"
 msgstr ""
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2322 src/toolbar.c:2333
+#: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
 msgid "Compose Email"
 msgstr ""
 
-#: src/toolbar.c:228
+#: src/toolbar.c:231
 msgid "Compose News"
 msgstr ""
 
-#: src/toolbar.c:229 src/toolbar.c:2377 src/toolbar.c:2387
+#: src/toolbar.c:232 src/toolbar.c:2418 src/toolbar.c:2428
 msgid "Reply to Message"
 msgstr ""
 
-#: src/toolbar.c:230 src/toolbar.c:2394 src/toolbar.c:2404
+#: src/toolbar.c:233 src/toolbar.c:2435 src/toolbar.c:2445
 msgid "Reply to Sender"
 msgstr ""
 
-#: src/toolbar.c:231 src/toolbar.c:2411 src/toolbar.c:2421
+#: src/toolbar.c:234 src/toolbar.c:2452 src/toolbar.c:2462
 msgid "Reply to All"
 msgstr ""
 
-#: src/toolbar.c:232 src/toolbar.c:2428 src/toolbar.c:2438
+#: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
 msgid "Reply to Mailing-list"
 msgstr ""
 
-#: src/toolbar.c:233 src/toolbar.c:2316
+#: src/toolbar.c:236 src/toolbar.c:2357
 msgid "Open email"
 msgstr ""
 
-#: src/toolbar.c:234 src/toolbar.c:2445 src/toolbar.c:2456
+#: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
 msgid "Forward Message"
 msgstr ""
 
-#: src/toolbar.c:235 src/toolbar.c:2461
+#: src/toolbar.c:238 src/toolbar.c:2502
 msgid "Trash Message"
 msgstr "Move Message to Wastebin"
 
-#: src/toolbar.c:236 src/toolbar.c:2465
+#: src/toolbar.c:239 src/toolbar.c:2506
 msgid "Delete Message"
 msgstr ""
 
-#: src/toolbar.c:237
+#: src/toolbar.c:240
 msgid "Delete duplicate messages"
 msgstr ""
 
-#: src/toolbar.c:239 src/toolbar.c:2473
+#: src/toolbar.c:242 src/toolbar.c:2514
 msgid "Go to Previous Unread Message"
 msgstr ""
 
-#: src/toolbar.c:240 src/toolbar.c:2477
+#: src/toolbar.c:243 src/toolbar.c:2518
 msgid "Go to Next Unread Message"
 msgstr ""
 
-#: src/toolbar.c:244
+#: src/toolbar.c:247
 msgid "Mark Message"
 msgstr ""
 
-#: src/toolbar.c:245
+#: src/toolbar.c:248
 msgid "Unmark Message"
 msgstr ""
 
-#: src/toolbar.c:246
+#: src/toolbar.c:249
 msgid "Lock Message"
 msgstr ""
 
-#: src/toolbar.c:247
+#: src/toolbar.c:250
 msgid "Unlock Message"
 msgstr ""
 
-#: src/toolbar.c:248
+#: src/toolbar.c:251
 msgid "Mark all Messages as read"
 msgstr ""
 
-#: src/toolbar.c:249
+#: src/toolbar.c:252
 msgid "Mark all Messages as unread"
 msgstr ""
 
-#: src/toolbar.c:250
+#: src/toolbar.c:253
 msgid "Mark Message as read"
 msgstr ""
 
-#: src/toolbar.c:251
+#: src/toolbar.c:254
 msgid "Mark Message as unread"
 msgstr ""
 
-#: src/toolbar.c:253 src/toolbar.c:514
+#: src/toolbar.c:255
+msgid "Run folder processing rules"
+msgstr ""
+
+#: src/toolbar.c:257 src/toolbar.c:525
 msgid "Print"
 msgstr ""
 
-#: src/toolbar.c:254
+#: src/toolbar.c:258
 msgid "Learn Spam or Ham"
 msgstr ""
 
-#: src/toolbar.c:255
+#: src/toolbar.c:259
 msgid "Open folder/Go to folder list"
 msgstr ""
 
-#: src/toolbar.c:258 src/toolbar.c:2483
+#: src/toolbar.c:262 src/toolbar.c:2524
 msgid "Send Message"
 msgstr ""
 
-#: src/toolbar.c:259 src/toolbar.c:2487
+#: src/toolbar.c:263 src/toolbar.c:2528
 msgid "Put into queue folder and send later"
 msgstr ""
 
-#: src/toolbar.c:260 src/toolbar.c:2491
+#: src/toolbar.c:264 src/toolbar.c:2532
 msgid "Save to draft folder"
 msgstr ""
 
-#: src/toolbar.c:261 src/toolbar.c:2495
+#: src/toolbar.c:265 src/toolbar.c:2536
 msgid "Insert file"
 msgstr ""
 
-#: src/toolbar.c:262 src/toolbar.c:2499
+#: src/toolbar.c:266 src/toolbar.c:2540
 msgid "Attach file"
 msgstr ""
 
-#: src/toolbar.c:263 src/toolbar.c:2503
+#: src/toolbar.c:267 src/toolbar.c:2544
 msgid "Insert signature"
 msgstr ""
 
-#: src/toolbar.c:264 src/toolbar.c:2507
+#: src/toolbar.c:268 src/toolbar.c:2548
 msgid "Replace signature"
 msgstr ""
 
-#: src/toolbar.c:265 src/toolbar.c:2511
+#: src/toolbar.c:269 src/toolbar.c:2552
 msgid "Edit with external editor"
 msgstr ""
 
-#: src/toolbar.c:266 src/toolbar.c:2515
+#: src/toolbar.c:270 src/toolbar.c:2556
 msgid "Wrap long lines of current paragraph"
 msgstr ""
 
-#: src/toolbar.c:267 src/toolbar.c:2519
+#: src/toolbar.c:271 src/toolbar.c:2560
 msgid "Wrap all long lines"
 msgstr ""
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2528
+#: src/toolbar.c:274 src/toolbar.c:542 src/toolbar.c:2569
 msgid "Check spelling"
 msgstr ""
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2533
+#: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2574
 msgid "Sign"
 msgstr ""
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2541
+#: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
 msgid "Encrypt"
 msgstr ""
 
-#: src/toolbar.c:274
+#: src/toolbar.c:278
 msgid "Claws Mail Actions Feature"
 msgstr ""
 
-#: src/toolbar.c:275 src/toolbar.c:2560
+#: src/toolbar.c:279 src/toolbar.c:2601
 msgid "Cancel receiving"
 msgstr ""
 
-#: src/toolbar.c:277 src/toolbar.c:2568
+#: src/toolbar.c:281 src/toolbar.c:2609
 msgid "Cancel receiving/sending"
 msgstr ""
 
-#: src/toolbar.c:278 src/toolbar.c:2308
+#: src/toolbar.c:282 src/toolbar.c:2349
 msgid "Close window"
 msgstr ""
 
-#: src/toolbar.c:280
+#: src/toolbar.c:284
 msgid "Claws Mail Plugins"
 msgstr ""
 
-#: src/toolbar.c:445 src/toolbar.c:496
+#: src/toolbar.c:450 src/toolbar.c:506
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/toolbar.c:485
+#: src/toolbar.c:495
 msgid "Get Mail"
 msgstr ""
 
-#: src/toolbar.c:486
+#: src/toolbar.c:496
 msgid "Get"
 msgstr ""
 
-#: src/toolbar.c:488 src/toolbar.c:489
+#: src/toolbar.c:498 src/toolbar.c:499
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr ""
 
-#: src/toolbar.c:491
+#: src/toolbar.c:501
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr ""
 
-#: src/toolbar.c:492
+#: src/toolbar.c:502
 msgid "All"
 msgstr ""
 
-#: src/toolbar.c:493
+#: src/toolbar.c:503
 msgid "List"
 msgstr ""
 
-#: src/toolbar.c:498 src/toolbar.c:2361 src/toolbar.c:2370
+#: src/toolbar.c:508 src/toolbar.c:2402 src/toolbar.c:2411
 msgid "Delete duplicates"
 msgstr ""
 
-#: src/toolbar.c:500
+#: src/toolbar.c:510
 msgid "Prev"
 msgstr ""
 
-#: src/toolbar.c:501
+#: src/toolbar.c:511
 msgid "Next"
 msgstr ""
 
-#: src/toolbar.c:509
+#: src/toolbar.c:519
 msgid "All read"
 msgstr ""
 
-#: src/toolbar.c:510
+#: src/toolbar.c:520
 msgid "All unread"
 msgstr ""
 
-#: src/toolbar.c:511
+#: src/toolbar.c:521
 msgid "Read"
 msgstr ""
 
-#: src/toolbar.c:516
+#: src/toolbar.c:523
+msgid "Run proc. rules"
+msgstr ""
+
+#: src/toolbar.c:527
 msgid "Folders"
 msgstr ""
 
-#: src/toolbar.c:521
+#: src/toolbar.c:532
 msgid "Draft"
 msgstr ""
 
-#: src/toolbar.c:524
+#: src/toolbar.c:535
 msgid "Insert sig."
 msgstr ""
 
-#: src/toolbar.c:525
+#: src/toolbar.c:536
 msgid "Replace sig."
 msgstr ""
 
-#: src/toolbar.c:526
+#: src/toolbar.c:537
 msgid "Edit"
 msgstr ""
 
-#: src/toolbar.c:527
+#: src/toolbar.c:538
 msgid "Wrap para."
 msgstr ""
 
-#: src/toolbar.c:528
+#: src/toolbar.c:539
 msgid "Wrap all"
 msgstr ""
 
-#: src/toolbar.c:536 src/toolbar.c:537
+#: src/toolbar.c:547 src/toolbar.c:548
 msgid "Stop"
 msgstr ""
 
-#: src/toolbar.c:538
+#: src/toolbar.c:549
 msgid "Stop all"
 msgstr ""
 
-#: src/toolbar.c:951
+#: src/toolbar.c:968
 msgid "Compose News message"
 msgstr ""
 
-#: src/toolbar.c:990
+#: src/toolbar.c:1007
 msgid "Learn spam"
 msgstr ""
 
-#: src/toolbar.c:999
+#: src/toolbar.c:1016
 msgid "Ham"
 msgstr ""
 
-#: src/toolbar.c:1001
+#: src/toolbar.c:1018
 msgid "Learn ham"
 msgstr ""
 
-#: src/toolbar.c:1916
+#: src/toolbar.c:1956
 msgid "Message will be signed"
 msgstr ""
 
-#: src/toolbar.c:1918
+#: src/toolbar.c:1958
 msgid "Message will not be signed"
 msgstr ""
 
-#: src/toolbar.c:1937
+#: src/toolbar.c:1977
 msgid "Message will be encrypted"
 msgstr ""
 
-#: src/toolbar.c:1939
+#: src/toolbar.c:1979
 msgid "Message will not be encrypted"
 msgstr ""
 
-#: src/toolbar.c:2290
+#: src/toolbar.c:2331
 msgid "Go to folder list"
 msgstr ""
 
-#: src/toolbar.c:2296
+#: src/toolbar.c:2337
 msgid "Receive Mail from selected Account"
 msgstr ""
 
-#: src/toolbar.c:2312
+#: src/toolbar.c:2353
 msgid "Open preferences"
 msgstr ""
 
-#: src/toolbar.c:2323
+#: src/toolbar.c:2364
 msgid "Compose with selected Account"
 msgstr ""
 
-#: src/toolbar.c:2344
+#: src/toolbar.c:2385
 msgid "Learn as..."
 msgstr ""
 
-#: src/toolbar.c:2354
+#: src/toolbar.c:2395
 msgid "Learn as _Spam"
 msgstr ""
 
-#: src/toolbar.c:2355
+#: src/toolbar.c:2396
 msgid "Learn as _Ham"
 msgstr ""
 
-#: src/toolbar.c:2362
+#: src/toolbar.c:2403
 msgid "Delete duplicates options"
 msgstr ""
 
-#: src/toolbar.c:2366
+#: src/toolbar.c:2407
 msgid "Delete duplicates in selected folder"
 msgstr ""
 
-#: src/toolbar.c:2367
+#: src/toolbar.c:2408
 msgid "Delete duplicates in all folders"
 msgstr ""
 
-#: src/toolbar.c:2378
+#: src/toolbar.c:2419
 msgid "Reply to Message options"
 msgstr ""
 
-#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
+#: src/toolbar.c:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "_Reply with quote"
 msgstr ""
 
-#: src/toolbar.c:2383 src/toolbar.c:2400 src/toolbar.c:2417 src/toolbar.c:2434
+#: src/toolbar.c:2424 src/toolbar.c:2441 src/toolbar.c:2458 src/toolbar.c:2475
 msgid "Reply without _quote"
 msgstr ""
 
-#: src/toolbar.c:2395
+#: src/toolbar.c:2436
 msgid "Reply to Sender options"
 msgstr ""
 
-#: src/toolbar.c:2412
+#: src/toolbar.c:2453
 msgid "Reply to All options"
 msgstr ""
 
-#: src/toolbar.c:2429
+#: src/toolbar.c:2470
 msgid "Reply to Mailing-list options"
 msgstr ""
 
-#: src/toolbar.c:2446
+#: src/toolbar.c:2487
 msgid "Forward Message options"
 msgstr ""
 
-#: src/uri_opener.c:85
+#: src/uri_opener.c:70
+msgid "C_opy URL"
+msgstr ""
+
+#: src/uri_opener.c:101
 msgid "There are no URLs in this email."
 msgstr ""
 
-#: src/uri_opener.c:113
-msgid "Available URLs:"
+#: src/uri_opener.c:129
+msgid "Included URLs:"
 msgstr ""
 
-#: src/uri_opener.c:187
+#: src/uri_opener.c:209
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr ""
 
-#: src/uri_opener.c:203
+#: src/uri_opener.c:225
 msgid "Open in browser"
 msgstr ""
 
-#: src/uri_opener.c:215
-msgid "Please select the URL to open."
+#: src/uri_opener.c:237
+msgid "Any phishing URLs are shown in red, followed by the actual URL."
 msgstr ""
 
-#: src/uri_opener.c:223
+#: src/uri_opener.c:245
 msgid "Select All"
 msgstr ""
 
@@ -18896,43 +19078,43 @@ msgstr ""
 msgid "Please enter your SMTP username."
 msgstr ""
 
-#: src/wizard.c:973
+#: src/wizard.c:968
 msgid "Your name:"
 msgstr ""
 
-#: src/wizard.c:985
+#: src/wizard.c:981
 msgid "Your email address:"
 msgstr ""
 
-#: src/wizard.c:997
+#: src/wizard.c:994
 msgid "Your organization:"
 msgstr "Your organisation:"
 
-#: src/wizard.c:1031
+#: src/wizard.c:1029
 msgid "Mailbox name:"
 msgstr ""
 
-#: src/wizard.c:1038
+#: src/wizard.c:1036
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 
-#: src/wizard.c:1108
+#: src/wizard.c:1106
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 
-#: src/wizard.c:1111
+#: src/wizard.c:1109
 msgid "SMTP server address:"
 msgstr ""
 
-#: src/wizard.c:1126
+#: src/wizard.c:1124
 msgid "(empty to use the same as receive)"
 msgstr ""
 
-#: src/wizard.c:1141
+#: src/wizard.c:1139
 msgid "SMTP username:"
 msgstr ""
 
@@ -18940,67 +19122,71 @@ msgstr ""
 msgid "SMTP password:"
 msgstr ""
 
-#: src/wizard.c:1168
+#: src/wizard.c:1169
 msgid "Use TLS to connect to SMTP server"
 msgstr ""
 
-#: src/wizard.c:1179 src/wizard.c:1608
+#: src/wizard.c:1180 src/wizard.c:1623
 msgid "Use STARTTLS command to start encryption"
 msgstr ""
 
-#: src/wizard.c:1191 src/wizard.c:1621
+#: src/wizard.c:1192 src/wizard.c:1636
 msgid "Client TLS certificate (optional)"
 msgstr ""
 
-#: src/wizard.c:1266 src/wizard.c:1298 src/wizard.c:1551
+#: src/wizard.c:1201 src/wizard.c:1646
+msgid "File:"
+msgstr ""
+
+#: src/wizard.c:1274 src/wizard.c:1306 src/wizard.c:1560
 msgid "Server address:"
 msgstr ""
 
-#: src/wizard.c:1330
+#: src/wizard.c:1338
 msgid "Local mailbox:"
 msgstr ""
 
-#: src/wizard.c:1498
+#: src/wizard.c:1506
 msgid "Server type:"
 msgstr ""
 
-#: src/wizard.c:1507
+#: src/wizard.c:1515
 msgid "POP3"
 msgstr ""
 
-#: src/wizard.c:1562
+#: src/wizard.c:1573
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 
-#: src/wizard.c:1597
+#: src/wizard.c:1612
 msgid "Use TLS to connect to receiving server"
 msgstr ""
 
-#: src/wizard.c:1670
+#: src/wizard.c:1690
 msgid "IMAP server directory:"
 msgstr ""
 
-#: src/wizard.c:1681
+#: src/wizard.c:1701
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: src/wizard.c:1689
+#: src/wizard.c:1709
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
 msgstr ""
 
-#: src/wizard.c:1808
+#: src/wizard.c:1828
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 
-#: src/wizard.c:1842
+#: src/wizard.c:1862
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:1849
+#: src/wizard.c:1869
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19009,31 +19195,31 @@ msgid ""
 "five minutes."
 msgstr ""
 
-#: src/wizard.c:1862
+#: src/wizard.c:1882
 msgid "About You"
 msgstr ""
 
-#: src/wizard.c:1869 src/wizard.c:1883 src/wizard.c:1897 src/wizard.c:1912
+#: src/wizard.c:1889 src/wizard.c:1903 src/wizard.c:1917 src/wizard.c:1932
 msgid "Bold fields must be completed"
 msgstr ""
 
-#: src/wizard.c:1876
+#: src/wizard.c:1896
 msgid "Receiving mail"
 msgstr ""
 
-#: src/wizard.c:1890
+#: src/wizard.c:1910
 msgid "Sending mail"
 msgstr ""
 
-#: src/wizard.c:1905
+#: src/wizard.c:1925
 msgid "Saving mail on disk"
 msgstr ""
 
-#: src/wizard.c:1920
+#: src/wizard.c:1940
 msgid "Configuration finished"
 msgstr ""
 
-#: src/wizard.c:1927
+#: src/wizard.c:1947
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."