[Commits] [SCM] claws branch, master, updated. 4.3.0-5-g2a9e74862

paul at claws-mail.org paul at claws-mail.org
Tue Jun 11 07:09:29 UTC 2024


The branch, master has been updated
       via  2a9e748623a8f12f0a515877faf2aa05fa9fa19b (commit)
      from  ea37e3c4db408635072480c22d6cb6262a7e057d (commit)

Summary of changes:
 po/en_GB.po | 5312 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 2608 insertions(+), 2704 deletions(-)


- Log -----------------------------------------------------------------
commit 2a9e748623a8f12f0a515877faf2aa05fa9fa19b
Author: Paul <paul at claws-mail.org>
Date:   Tue Jun 11 08:09:25 2024 +0100

    update en_GB

diff --git a/po/en_GB.po b/po/en_GB.po
index f1aa5db2c..883d6c8ef 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Claws Mail 4.0.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2022-05-18 15:12+0100\n"
+"POT-Creation-Date: 2024-06-11 07:24+0100\n"
 "PO-Revision-Date: 2021-07-08 09:43+0100\n"
 "Last-Translator: Paul Mangan <paul at claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul at claws-mail.org>\n"
@@ -19,135 +19,137 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:402 src/account.c:469
+#: src/account.c:401 src/account.c:468
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
 
-#: src/account.c:447
+#: src/account.c:446
 msgid "Can't create folder."
 msgstr ""
 
-#: src/account.c:735
+#: src/account.c:734
 msgid "Edit accounts"
 msgstr ""
 
-#: src/account.c:752
+#: src/account.c:751
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
 "indicates the default account."
 msgstr ""
 
-#: src/account.c:781 src/foldersel.c:348
+#: src/account.c:780 src/foldersel.c:346
 msgid "_New"
 msgstr ""
 
-#: src/account.c:787
+#: src/account.c:786
 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/account.c:788 src/addressbook.c:399 src/addressbook.c:429
+#: src/addressbook.c:454 src/addressbook.c:471 src/compose.c:615
+#: src/mainwindow.c:517 src/messageview.c:213
 #: src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr ""
 
-#: src/account.c:795
+#: src/account.c:794
 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/account.c:796 src/addrcustomattr.c:162 src/addrcustomattr.c:188
+#: src/addrcustomattr.c:493 src/addrduplicates.c:395 src/addrduplicates.c:791
+#: src/addressbook.c:1476 src/addressbook.c:1484 src/addressbook.c:2962
+#: src/addressbook.c:2990 src/addressbook.c:2997 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/edittags.c:234 src/edittags.c:270 src/edittags.c:584 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_actions.c:746 src/prefs_customheader.c:255
 #: 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
+#: src/prefs_filtering.c:1216 src/prefs_template.c:315 src/prefs_template.c:898
+#: src/prefs_template.c:911 src/prefs_toolbar.c:1010 src/ssl_manager.c:209
+#: src/ssl_manager.c:451
 msgid "D_elete"
 msgstr ""
 
-#: src/account.c:803
+#: src/account.c:802
 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/account.c:804 src/addressbook.c:426 src/addressbook.c:462
+#: src/addressbook.c:478 src/compose.c:644 src/mainwindow.c:551
 #: src/messageview.c:229 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr ""
 
-#: src/account.c:811
+#: src/account.c:810
 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/account.c:812 src/editaddress.c:1324 src/gtk/foldersort.c:318
+#: src/prefs_actions.c:401 src/prefs_customheader.c:288
+#: src/prefs_display_header.c:390 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_summary_open.c:294 src/prefs_template.c:373
 #: src/prefs_toolbar.c:1058
 msgid "_Down"
 msgstr ""
 
-#: src/account.c:819
+#: src/account.c:818
 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/account.c:820 src/editaddress.c:1323 src/gtk/foldersort.c:312
+#: src/prefs_actions.c:393 src/prefs_customheader.c:282
+#: src/prefs_display_header.c:384 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_summary_open.c:288 src/prefs_template.c:365
 #: src/prefs_toolbar.c:1054
 msgid "_Up"
 msgstr ""
 
-#: src/account.c:827
+#: src/account.c:826
 msgid "Move the selected account up"
 msgstr ""
 
-#: src/account.c:834
+#: src/account.c:833
 msgid " _Set as default account "
 msgstr ""
 
-#: 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/account.c:840 src/action.c:1409 src/addrduplicates.c:399
+#: src/addrduplicates.c:841 src/addressadd.c:599 src/addressbook.c:420
+#: src/addressbook.c:1430 src/addressbook.c:3265 src/addressbook.c:3317
+#: src/addressbook.c:4186 src/addressbook.c:4191 src/addressbook.c:4307
+#: src/addrindex.c:1837 src/alertpanel.c:139 src/alertpanel.c:203
+#: src/browseldap.c:301 src/compose.c:636 src/compose.c:10990
+#: src/edittags.c:589 src/exphtmldlg.c:193 src/exphtmldlg.c:295
+#: src/expldifdlg.c:323 src/gtk/about.c:931 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:844
+#: src/message_search.c:238 src/message_search.c:320 src/messageview.c:226
+#: src/mimeview.c:1868 src/mimeview.c:1885
+#: 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/plugins/pgpcore/sgpgme.c:1000 src/prefs_actions.c:915
+#: src/prefs_actions.c:920 src/prefs_actions.c:946 src/prefs_actions.c:1314
 #: 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/prefs_filtering.c:1516 src/prefs_matcher.c:2167 src/prefs_template.c:566
+#: src/prefs_template.c:591 src/prefs_template.c:596 src/prefs_themes.c:696
 #: src/summary_search.c:495 src/summary_search.c:785
 msgid "_Close"
 msgstr ""
 
-#: src/account.c:926
+#: src/account.c:925
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
-#: src/account.c:933
+#: src/account.c:932
 #, c-format
 msgid "Copy of %s"
 msgstr ""
@@ -166,147 +168,146 @@ msgid "Delete account"
 msgstr ""
 
 #: 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/addrcustomattr.c:496 src/addrduplicates.c:147 src/addrduplicates.c:791
+#: src/addressadd.c:299 src/addressbook.c:1476 src/addressbook.c:1484
+#: src/addressbook.c:2962 src/addressbook.c:2975 src/addressbook.c:2989
+#: src/addressbook.c:2996 src/addressbook_foldersel.c:210 src/addrgather.c:554
+#: src/compose.c:3712 src/compose.c:3844 src/compose.c:5152 src/compose.c:5189
+#: src/compose.c:5226 src/compose.c:5269 src/compose.c:5833 src/compose.c:5892
+#: src/compose.c:6128 src/compose.c:9560 src/compose.c:10769
+#: src/compose.c:10774 src/compose.c:10848 src/compose.c:11885
+#: src/compose.c:12402 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/export.c:174 src/foldersel.c:347 src/folderview.c:2506
+#: src/folderview.c:2564 src/grouplistdialog.c:238 src/gtk/foldersort.c:244
+#: src/gtk/gtkaspell.c:1504 src/gtk/inputdialog.c:366 src/gtk/prefswindow.c:507
+#: src/gtk/progressdialog.c:93 src/imap.c:1243 src/imap_gtk.c:369
+#: src/imap_gtk.c:516 src/imap_gtk.c:576 src/import.c:177 src/importldif.c:925
+#: src/importldif.c:991 src/importmutt.c:250 src/importpine.c:249 src/inc.c:893
+#: src/main.c:2197 src/mainwindow.c:4002 src/mainwindow.c:4205 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:1852 src/mimeview.c:2293 src/news.c:407
+#: src/news_gtk.c:252 src/password_gtk.c:215
+#: 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: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/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1042
+#: src/plugins/att_remover/att_remover.c:383
+#: src/plugins/att_remover/att_remover.c:425
 #: src/plugins/attachwarner/attachwarner.c:218
-#: src/plugins/clamd/clamav_plugin_gtk.c:91
-#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
 #: 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:435
 #: src/plugins/managesieve/sieve_editor.c:632
 #: src/plugins/managesieve/sieve_manager.c:330
-#: src/plugins/notification/notification_foldercheck.c:588
+#: src/plugins/notification/notification_foldercheck.c:585
 #: src/plugins/notification/notification_trayicon.c:550
-#: 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/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:46
 #: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1059
-#: src/plugins/vcalendar/vcal_folder.c:2032
+#: src/plugins/vcalendar/vcal_folder.c:2027
 #: 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_actions.c:724 src/prefs_actions.c:746 src/prefs_customheader.c:176
+#: src/prefs_customheader.c:695 src/prefs_display_header.c:245
 #: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
 #: 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: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
+#: src/prefs_matcher.c:572 src/prefs_summaries.c:321
+#: src/prefs_summary_column.c:355 src/prefs_summary_open.c:180
+#: src/prefs_template.c:398 src/prefs_template.c:898 src/prefs_template.c:911
+#: src/prefs_themes.c:577 src/send_message.c:300 src/ssl_manager.c:451
+#: src/summaryview.c:1334 src/summaryview.c:4561 src/summaryview.c:5030
+#: src/summaryview.c:5086 src/summaryview.c:5825 src/textview.c:3113
+#: src/toolbar.c:3107 src/wizard.c:1833
 msgid "_Cancel"
 msgstr ""
 
-#: 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/account.c:1141 src/addrcustomattr.c:218 src/addressbook.c:430
+#: src/addressbook.c:455 src/addressbook.c:472 src/edittags.c:297
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1309
+#: src/plugins/att_remover/att_remover.c:425
 #: src/plugins/mailmbox/plugin_gtk.c:336
 #: src/plugins/managesieve/sieve_manager.c:330
-#: 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:1689 src/prefs_template.c:1105 src/summaryview.c:4560
+#: src/plugins/rssyl/rssyl_cb_menu.c:189
+#: src/plugins/vcalendar/vcal_folder.c:2027 src/prefs_actions.c:1105
+#: src/prefs_customheader.c:695 src/prefs_display_header.c:327
+#: src/prefs_filtering.c:1689 src/prefs_template.c:1104 src/summaryview.c:4561
 msgid "_Delete"
 msgstr ""
 
-#: src/account.c:1615
+#: src/account.c:1614
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1621
+#: src/account.c:1620
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: 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/account.c:1627 src/addrduplicates.c:470 src/addressadd.c:220
+#: src/addressbook.c:126 src/compose.c:7508 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: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: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
+#: src/mimeview.c:311 src/plugins/managesieve/sieve_manager.c:470
+#: src/plugins/pdf_viewer/poppler_viewer.c:1858
+#: src/plugins/pgpcore/select-keys.c:466 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1861 src/prefs_summaries.c:544 src/prefs_template.c:77
+#: src/prefs_themes.c:1071
 msgid "Name"
 msgstr ""
 
-#: src/account.c:1636 src/prefs_account.c:1267 src/prefs_account.c:4958
+#: src/account.c:1635 src/prefs_account.c:1299 src/prefs_account.c:5043
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1644 src/ssl_manager.c:109
+#: src/account.c:1643 src/ssl_manager.c:109
 msgid "Server"
 msgstr ""
 
-#: src/action.c:380
+#: src/action.c:381
 #, c-format
 msgid "Could not get message file %d"
 msgstr ""
 
-#: src/action.c:418
+#: src/action.c:419
 msgid "Could not get message part."
 msgstr ""
 
-#: src/action.c:435
+#: src/action.c:436
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr ""
 
-#: src/action.c:607
+#: src/action.c:608
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
 msgstr ""
 
-#: src/action.c:728
+#: src/action.c:729
 msgid "There is no filtering action set"
 msgstr ""
 
-#: src/action.c:730
+#: src/action.c:731
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
 "%s"
 msgstr ""
 
-#: src/action.c:1000
+#: src/action.c:1001
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -314,44 +315,44 @@ msgid ""
 "%s"
 msgstr ""
 
-#: 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/action.c:1003 src/compose.c:5302 src/compose.c:5307 src/compose.c:9725
+#: src/compose.c:9768 src/ldaputil.c:334
+#: src/plugins/bogofilter/bogofilter.c:861
 #: src/plugins/tnef_parse/tnef_parse.c:76
-#: 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
+#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1842
+#: src/plugins/vcalendar/vcal_folder.c:1845 src/privacy.c:64
 msgid "Unknown error"
 msgstr ""
 
-#: src/action.c:1223 src/action.c:1397
+#: src/action.c:1224 src/action.c:1398
 msgid "Completed"
 msgstr ""
 
-#: src/action.c:1260
+#: src/action.c:1261
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1264
+#: src/action.c:1265
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1307
+#: src/action.c:1308
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1371
+#: src/action.c:1372
 msgid "_Execute"
 msgstr ""
 
-#: src/action.c:1406
+#: src/action.c:1407
 msgid "_Stop"
 msgstr ""
 
-#: src/action.c:1648
+#: src/action.c:1649
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -359,11 +360,11 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1653
+#: src/action.c:1654
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1657
+#: src/action.c:1658
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -371,23 +372,23 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1662
+#: src/action.c:1663
 msgid "Action's user argument"
 msgstr ""
 
-#: src/addrclip.c:483
+#: src/addrclip.c:484
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addrclip.c:506
+#: src/addrclip.c:507
 msgid "Cannot copy an address book to itself."
 msgstr ""
 
-#: src/addrclip.c:597
+#: src/addrclip.c:598
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addr_compl.c:699 src/addressbook.c:5008
+#: src/addr_compl.c:698 src/addressbook.c:5016
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr ""
@@ -458,44 +459,45 @@ msgid ""
 "with the default set?"
 msgstr ""
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/exphtmldlg.c:181
+#: src/addrcustomattr.c:199 src/compose.c:9847 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: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:712
-#: src/plugins/pgpcore/sgpgme.c:1088 src/plugins/pgpcore/sgpgme.c:1211
+#: src/file_checker.c:107 src/folderview.c:887 src/folderview.c:1115
+#: src/folderview.c:2552 src/folderview.c:2674 src/inc.c:1676 src/main.c:405
+#: src/mainwindow.c:2864 src/mainwindow.c:2869 src/message_search.c:335
+#: src/mimeview.c:1826 src/plugins/libravatar/libravatar_prefs.c:179
+#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:710
+#: src/plugins/pgpcore/sgpgme.c:1084 src/plugins/pgpcore/sgpgme.c:1207
 #: 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
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1334 src/summaryview.c:1943 src/summaryview.c:1991
+#: src/summaryview.c:2028 src/summaryview.c:2076 src/summaryview.c:2110
+#: src/summaryview.c:2144 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:6092
+#: src/toolbar.c:3087
 msgid "_No"
 msgstr ""
 
-#: src/addrcustomattr.c:199 src/compose.c:9838 src/compose.c:12248
+#: src/addrcustomattr.c:199 src/compose.c:9847 src/compose.c:12402
 #: 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: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:712 src/plugins/pgpcore/sgpgme.c:1088
-#: src/plugins/pgpcore/sgpgme.c:1211 src/plugins/vcalendar/vcalendar.c:123
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:887
+#: src/folderview.c:1115 src/folderview.c:2552 src/folderview.c:2674
+#: src/inc.c:1676 src/main.c:405 src/mainwindow.c:2864 src/mainwindow.c:2869
+#: src/message_search.c:335 src/mimeview.c:1827
+#: src/plugins/libravatar/libravatar_prefs.c:179
+#: src/plugins/pgpcore/select-keys.c:710 src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1207 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
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/summary_search.c:797
+#: src/summaryview.c:1334 src/summaryview.c:1943 src/summaryview.c:1991
+#: src/summaryview.c:2028 src/summaryview.c:2076 src/summaryview.c:2110
+#: src/summaryview.c:2144 src/summaryview.c:2178 src/summaryview.c:2208
+#: src/summaryview.c:4275 src/summaryview.c:4321 src/summaryview.c:5086
+#: src/summaryview.c:6092 src/toolbar.c:3087
 msgid "_Yes"
 msgstr ""
 
 #: src/addrcustomattr.c:219 src/edittags.c:298 src/prefs_actions.c:1106
-#: src/prefs_filtering.c:1690 src/prefs_template.c:1106
+#: src/prefs_filtering.c:1690 src/prefs_template.c:1105
 msgid "Delete _all"
 msgstr ""
 
@@ -503,63 +505,61 @@ msgstr ""
 msgid "_Reset to default"
 msgstr ""
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:408
 msgid "Attribute name is not set."
 msgstr ""
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:467
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr ""
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:481
 msgid "New attribute name:"
 msgstr ""
 
-#: src/addrcustomattr.c:492 src/editaddress.c:1327 src/editaddress.c:1559
+#: src/addrcustomattr.c:490 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/edittags.c:579 src/prefs_actions.c:320 src/prefs_customheader.c:248
+#: src/prefs_display_header.c:320 src/prefs_display_header.c:371
 #: 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:998
+#: src/prefs_summary_column.c:285 src/prefs_summary_open.c:240
+#: src/prefs_template.c:298 src/prefs_toolbar.c:998
 msgid "_Add"
 msgstr ""
 
-#: 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/addrcustomattr.c:497 src/addressadd.c:300
+#: src/addressbook_foldersel.c:211 src/addrgather.c:555 src/alertpanel.c:385
+#: src/compose.c:5892 src/compose.c:9561 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/editvcard.c:204 src/export.c:175 src/foldersel.c:348
+#: src/grouplistdialog.c:240 src/gtk/foldersort.c:245 src/gtk/gtkaspell.c:1506
+#: src/gtk/inputdialog.c:368 src/gtk/prefswindow.c:508 src/import.c:178
+#: src/importmutt.c:251 src/importpine.c:250 src/main.c:2197
+#: src/password_gtk.c:217 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:1045
-#: src/plugins/att_remover/att_remover.c:388
-#: src/plugins/gdata/cm_gdata_contacts.c:137
+#: src/plugins/archive/archiver_gtk.c:1044
+#: src/plugins/att_remover/att_remover.c:384
 #: src/plugins/managesieve/sieve_editor.c:633
-#: src/plugins/notification/notification_foldercheck.c:589
+#: src/plugins/notification/notification_foldercheck.c:586
 #: src/plugins/notification/notification_trayicon.c:550
 #: src/plugins/pgpcore/passphrase.c:123
-#: src/plugins/rssyl/rssyl_feed_props.c:487
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 #: 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_customheader.c:177 src/prefs_display_header.c:246
 #: 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:285 src/prefs_summary_column.c:356
-#: src/prefs_summary_open.c:182 src/prefs_template.c:400
+#: src/prefs_folder_column.c:342 src/prefs_matcher.c:573
+#: src/prefs_summaries.c:322 src/prefs_summary_column.c:356
+#: src/prefs_summary_open.c:181 src/prefs_template.c:399
 msgid "_OK"
 msgstr ""
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:518
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -582,7 +582,7 @@ 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/addrduplicates.c:147 src/addressbook.c:1158 src/compose.c:671
 #: src/messageview.c:232 src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr ""
@@ -595,29 +595,29 @@ msgstr ""
 msgid "Duplicate email addresses"
 msgstr ""
 
-#: src/addrduplicates.c:443 src/addressadd.c:233
-#: src/plugins/pgpcore/select-keys.c:474 src/prefs_summaries.c:480
-#: src/toolbar.c:540
+#: src/addrduplicates.c:442 src/addressadd.c:233
+#: src/plugins/pgpcore/select-keys.c:472 src/prefs_summaries.c:545
+#: src/toolbar.c:539
 msgid "Address"
 msgstr ""
 
-#: src/addrduplicates.c:465
+#: src/addrduplicates.c:463
 msgid "Address book path"
 msgstr ""
 
-#: src/addrduplicates.c:791 src/addressbook.c:1430 src/addressbook.c:1484
+#: src/addrduplicates.c:789 src/addressbook.c:1428 src/addressbook.c:1482
 msgid "Delete address(es)"
 msgstr ""
 
-#: src/addrduplicates.c:792 src/addressbook.c:1485
+#: src/addrduplicates.c:790 src/addressbook.c:1483
 msgid "Really delete the address(es)?"
 msgstr ""
 
-#: src/addrduplicates.c:841
+#: src/addrduplicates.c:839
 msgid "Delete address"
 msgstr ""
 
-#: src/addrduplicates.c:842 src/addressbook.c:1431
+#: src/addrduplicates.c:840 src/addressbook.c:1429
 msgid "This address data is read-only and cannot be deleted."
 msgstr ""
 
@@ -629,67 +629,67 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1258
+#: src/addressadd.c:243 src/addressbook.c:128 src/editaddress.c:1258
 #: src/editaddress.c:1303 src/editgroup.c:288
 msgid "Remarks"
 msgstr ""
 
-#: src/addressadd.c:288 src/addressbook_foldersel.c:158
+#: src/addressadd.c:287 src/addressbook_foldersel.c:157
 msgid "Select Address Book Folder"
 msgstr ""
 
-#: src/addressadd.c:598 src/addressbook.c:3255 src/addressbook.c:3307
+#: src/addressadd.c:597 src/addressbook.c:3263 src/addressbook.c:3315
 msgid "Add address(es)"
 msgstr ""
 
-#: src/addressadd.c:599
+#: src/addressadd.c:598
 msgid "Can't add the specified address"
 msgstr ""
 
-#: src/addressbook.c:129 src/addressbook.c:4996 src/editaddress.c:1247
+#: src/addressbook.c:127 src/addressbook.c:5004 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
+#: src/exporthtml.c:590 src/exporthtml.c:754 src/ldif.c:767
 msgid "Email Address"
 msgstr ""
 
-#: src/addressbook.c:400
+#: src/addressbook.c:398
 msgid "_Book"
 msgstr ""
 
-#: src/addressbook.c:402 src/compose.c:620 src/mainwindow.c:521
+#: src/addressbook.c:400 src/compose.c:620 src/mainwindow.c:520
 #: src/messageview.c:216
 msgid "_Tools"
 msgstr ""
 
-#: src/addressbook.c:405 src/addressbook.c:459
+#: src/addressbook.c:403 src/addressbook.c:457
 msgid "New _Book"
 msgstr ""
 
-#: src/addressbook.c:406 src/addressbook.c:460
+#: src/addressbook.c:404 src/addressbook.c:458
 msgid "New _Folder"
 msgstr ""
 
-#: src/addressbook.c:407
+#: src/addressbook.c:405
 msgid "New _vCard"
 msgstr ""
 
-#: src/addressbook.c:411
+#: src/addressbook.c:409
 msgid "New _JPilot"
 msgstr ""
 
-#: src/addressbook.c:414
+#: src/addressbook.c:412
 msgid "New LDAP _Server"
 msgstr ""
 
-#: src/addressbook.c:418
+#: src/addressbook.c:416
 msgid "_Edit book"
 msgstr ""
 
-#: src/addressbook.c:419
+#: src/addressbook.c:417
 msgid "_Delete book"
 msgstr ""
 
-#: src/addressbook.c:421 src/compose.c:632 src/editaddress.c:1326
+#: src/addressbook.c:419 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:435
@@ -697,343 +697,343 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:425 src/addressbook.c:471 src/messageview.c:230
+#: src/addressbook.c:423 src/addressbook.c:469 src/messageview.c:230
 msgid "_Select all"
 msgstr ""
 
-#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
+#: src/addressbook.c:425 src/addressbook.c:461 src/addressbook.c:477
 msgid "C_ut"
 msgstr ""
 
-#: src/addressbook.c:429 src/addressbook.c:465 src/addressbook.c:481
+#: src/addressbook.c:427 src/addressbook.c:463 src/addressbook.c:479
 #: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr ""
 
-#: src/addressbook.c:434 src/addressbook.c:476
+#: src/addressbook.c:432 src/addressbook.c:474
 msgid "New _Address"
 msgstr ""
 
-#: src/addressbook.c:435 src/addressbook.c:461 src/addressbook.c:477
+#: src/addressbook.c:433 src/addressbook.c:459 src/addressbook.c:475
 msgid "New _Group"
 msgstr ""
 
-#: src/addressbook.c:437 src/addressbook.c:483
+#: src/addressbook.c:435 src/addressbook.c:481
 msgid "_Mail To"
 msgstr ""
 
-#: src/addressbook.c:438 src/addressbook.c:487
+#: src/addressbook.c:436 src/addressbook.c:485
 msgid "_Merge"
 msgstr ""
 
-#: src/addressbook.c:442
+#: src/addressbook.c:440
 msgid "Import _LDIF file..."
 msgstr ""
 
-#: src/addressbook.c:443
+#: src/addressbook.c:441
 msgid "Import M_utt file..."
 msgstr ""
 
-#: src/addressbook.c:444
+#: src/addressbook.c:442
 msgid "Import _Pine file..."
 msgstr ""
 
-#: src/addressbook.c:446
+#: src/addressbook.c:444
 msgid "Export _HTML..."
 msgstr ""
 
-#: src/addressbook.c:447
+#: src/addressbook.c:445
 msgid "Export LDI_F..."
 msgstr ""
 
-#: src/addressbook.c:449
+#: src/addressbook.c:447
 msgid "Find duplicates..."
 msgstr ""
 
-#: src/addressbook.c:450
+#: src/addressbook.c:448
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:485
+#: src/addressbook.c:483
 msgid "_Browse Entry"
 msgstr ""
 
-#: 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/addressbook.c:497 src/crash.c:460 src/crash.c:479 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:249 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
+#: src/plugins/vcalendar/month-view.c:423 src/prefs_themes.c:896
+#: src/prefs_themes.c:928 src/prefs_themes.c:929
 msgid "Unknown"
 msgstr ""
 
-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:121
+#: src/addressbook.c:504 src/addressbook.c:523 src/importldif.c:121
 msgid "Success"
 msgstr ""
 
-#: src/addressbook.c:507 src/importldif.c:122
+#: src/addressbook.c:505 src/importldif.c:122
 msgid "Bad arguments"
 msgstr ""
 
-#: src/addressbook.c:508 src/importldif.c:123
+#: src/addressbook.c:506 src/importldif.c:123
 msgid "File not specified"
 msgstr ""
 
-#: src/addressbook.c:509 src/importldif.c:124
+#: src/addressbook.c:507 src/importldif.c:124
 msgid "Error opening file"
 msgstr ""
 
-#: src/addressbook.c:510 src/importldif.c:125
+#: src/addressbook.c:508 src/importldif.c:125
 msgid "Error reading file"
 msgstr ""
 
-#: src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:509 src/importldif.c:126
 msgid "End of file encountered"
 msgstr ""
 
-#: src/addressbook.c:512 src/importldif.c:127
+#: src/addressbook.c:510 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr ""
 
-#: src/addressbook.c:513 src/importldif.c:128
+#: src/addressbook.c:511 src/importldif.c:128
 msgid "Bad file format"
 msgstr ""
 
-#: src/addressbook.c:514 src/importldif.c:129
+#: src/addressbook.c:512 src/importldif.c:129
 msgid "Error writing to file"
 msgstr ""
 
-#: src/addressbook.c:515 src/importldif.c:130
+#: src/addressbook.c:513 src/importldif.c:130
 msgid "Error opening directory"
 msgstr ""
 
-#: src/addressbook.c:516 src/importldif.c:131
+#: src/addressbook.c:514 src/importldif.c:131
 msgid "No path specified"
 msgstr ""
 
-#: src/addressbook.c:526
+#: src/addressbook.c:524
 msgid "Error connecting to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:527
+#: src/addressbook.c:525
 msgid "Error initializing LDAP"
 msgstr ""
 
-#: src/addressbook.c:528
+#: src/addressbook.c:526
 msgid "Error binding to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:529
+#: src/addressbook.c:527
 msgid "Error searching LDAP database"
 msgstr ""
 
-#: src/addressbook.c:530
+#: src/addressbook.c:528
 msgid "Timeout performing LDAP operation"
 msgstr ""
 
-#: src/addressbook.c:531
+#: src/addressbook.c:529
 msgid "Error in LDAP search criteria"
 msgstr ""
 
-#: src/addressbook.c:532
+#: src/addressbook.c:530
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 
-#: src/addressbook.c:533
+#: src/addressbook.c:531
 msgid "LDAP search terminated on request"
 msgstr ""
 
-#: src/addressbook.c:534
+#: src/addressbook.c:532
 msgid "Error starting STARTTLS connection"
 msgstr ""
 
-#: src/addressbook.c:535
+#: src/addressbook.c:533
 msgid "Distinguished Name (dn) is missing"
 msgstr ""
 
-#: src/addressbook.c:536
+#: src/addressbook.c:534
 msgid "Missing required information"
 msgstr ""
 
-#: src/addressbook.c:537
+#: src/addressbook.c:535
 msgid "Another contact exists with that key"
 msgstr ""
 
-#: src/addressbook.c:538
+#: src/addressbook.c:536
 msgid "Strong(er) authentication required"
 msgstr ""
 
-#: src/addressbook.c:906
+#: src/addressbook.c:904
 msgid "Sources"
 msgstr ""
 
-#: src/addressbook.c:910 src/prefs_matcher.c:642 src/prefs_other.c:491
-#: src/toolbar.c:272 src/toolbar.c:2564
+#: src/addressbook.c:908 src/prefs_matcher.c:642 src/prefs_other.c:393
+#: src/toolbar.c:271 src/toolbar.c:2563
 msgid "Address book"
 msgstr ""
 
-#: src/addressbook.c:1103 src/editldap.c:777
+#: src/addressbook.c:1101 src/editldap.c:777
 msgid "Search"
 msgstr ""
 
-#: src/addressbook.c:1475
+#: src/addressbook.c:1473
 msgid "Delete group"
 msgstr ""
 
-#: src/addressbook.c:1476
+#: src/addressbook.c:1474
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2207
 msgid "Cannot paste. Target address book is read-only."
 msgstr ""
 
-#: src/addressbook.c:2215
+#: src/addressbook.c:2217
 msgid "Cannot paste into an address group."
 msgstr ""
 
-#: src/addressbook.c:2950
+#: src/addressbook.c:2958
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 
-#: src/addressbook.c:2953 src/addressbook.c:2981 src/addressbook.c:2988
+#: src/addressbook.c:2961 src/addressbook.c:2989 src/addressbook.c:2996
 #: src/plugins/archive/archiver_prefs.c:430 src/prefs_filtering_action.c:171
-#: src/toolbar.c:507
+#: src/toolbar.c:506
 msgid "Delete"
 msgstr ""
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:2971
 #, 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: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
+#: src/addressbook.c:2974 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:335 src/plugins/rssyl/rssyl_cb_menu.c:188
 msgid "Delete folder"
 msgstr ""
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:2975
 msgid "Delete _folder only"
 msgstr ""
 
-#: src/addressbook.c:2968
+#: src/addressbook.c:2976
 msgid "Delete folder and _addresses"
 msgstr ""
 
-#: src/addressbook.c:2979
+#: src/addressbook.c:2987
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2986
+#: src/addressbook.c:2994
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
-#: src/addressbook.c:3100
+#: src/addressbook.c:3108
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
-#: src/addressbook.c:3238 src/addressbook.c:3288
+#: src/addressbook.c:3246 src/addressbook.c:3296
 msgid "New Contacts"
 msgstr ""
 
-#: src/addressbook.c:4127
+#: src/addressbook.c:4135
 msgid "New user, could not save index file."
 msgstr ""
 
-#: src/addressbook.c:4131
+#: src/addressbook.c:4139
 msgid "New user, could not save address book files."
 msgstr ""
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4149
 msgid "Old address book converted successfully."
 msgstr ""
 
-#: src/addressbook.c:4146
+#: src/addressbook.c:4154
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4159
+#: src/addressbook.c:4167
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:4165
+#: src/addressbook.c:4173
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4170
+#: src/addressbook.c:4178
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:4177 src/addressbook.c:4182
+#: src/addressbook.c:4185 src/addressbook.c:4190
 msgid "Addressbook conversion error"
 msgstr ""
 
-#: src/addressbook.c:4297
+#: src/addressbook.c:4305
 msgid "Addressbook Error"
 msgstr ""
 
-#: src/addressbook.c:4298
+#: src/addressbook.c:4306
 msgid "Could not read address index"
 msgstr ""
 
-#: src/addressbook.c:4630
+#: src/addressbook.c:4638
 msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:4960 src/prefs_send.c:220
+#: src/addressbook.c:4968 src/prefs_send.c:220
 msgid "Interface"
 msgstr ""
 
-#: src/addressbook.c:4972
+#: src/addressbook.c:4980
 msgid "Address Books"
 msgstr ""
 
-#: src/addressbook.c:4984
+#: src/addressbook.c:4992
 msgid "Person"
 msgstr ""
 
-#: 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
+#: src/addressbook.c:5028 src/exporthtml.c:874 src/folderview.c:365
+#: src/folderview.c:453 src/prefs_account.c:3487 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr ""
 
-#: src/addressbook.c:5032
+#: src/addressbook.c:5040
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:5044 src/addressbook.c:5056
+#: src/addressbook.c:5052 src/addressbook.c:5064
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:5068
+#: src/addressbook.c:5076
 msgid "LDAP servers"
 msgstr ""
 
-#: src/addressbook.c:5080
+#: src/addressbook.c:5088
 msgid "LDAP Query"
 msgstr ""
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:374 src/expldifdlg.c:388
-#: src/exporthtml.c:981 src/importldif.c:541
+#: src/addressbook_foldersel.c:201 src/exphtmldlg.c:374 src/expldifdlg.c:388
+#: src/exporthtml.c:974 src/importldif.c:541
 msgid "Address Book"
 msgstr ""
 
@@ -1111,47 +1111,48 @@ msgstr ""
 msgid "Collect email addresses from folder"
 msgstr ""
 
-#: src/addrindex.c:125
+#: src/addrindex.c:124
 msgid "Common addresses"
 msgstr ""
 
-#: src/addrindex.c:126
+#: src/addrindex.c:125
 msgid "Personal addresses"
 msgstr ""
 
-#: src/addrindex.c:132
+#: src/addrindex.c:131
 msgid "Common address"
 msgstr ""
 
-#: src/addrindex.c:133
+#: src/addrindex.c:132
 msgid "Personal address"
 msgstr ""
 
-#: src/addrindex.c:1834
+#: src/addrindex.c:1835
 msgid "Address(es) update"
 msgstr ""
 
-#: src/addrindex.c:1835
+#: src/addrindex.c:1836
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
-#: src/alertpanel.c:154 src/compose.c:9838
+#: src/alertpanel.c:154 src/compose.c:9847 src/compose.c:10989
+#: src/mimeview.c:1868
 msgid "Notice"
 msgstr ""
 
-#: 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
+#: src/alertpanel.c:167 src/compose.c:5892 src/compose.c:6440
+#: src/compose.c:12402 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:861 src/mimeview.c:1885 src/plugins/pgpcore/sgpgme.c:996
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5086
 msgid "Warning"
 msgstr ""
 
-#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5821 src/inc.c:731
+#: src/alertpanel.c:180 src/alertpanel.c:203 src/compose.c:5833 src/inc.c:734
 #: src/plugins/pgpcore/sgpgme.c:342 src/plugins/pgpcore/sgpgme.c:497
 msgid "Error"
 msgstr ""
 
-#: src/alertpanel.c:204 src/gtk/progressdialog.c:92
+#: src/alertpanel.c:204 src/gtk/progressdialog.c:90
 msgid "_View log"
 msgstr ""
 
@@ -1171,11 +1172,11 @@ msgstr ""
 msgid "Distinguished Name (dn):"
 msgstr ""
 
-#: src/browseldap.c:284
+#: src/browseldap.c:283
 msgid "LDAP Name"
 msgstr ""
 
-#: src/browseldap.c:290
+#: src/browseldap.c:289
 msgid "Attribute Value"
 msgstr ""
 
@@ -1237,85 +1238,85 @@ msgstr ""
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
-#: src/common/plugin.c:774
+#: src/common/plugin.c:775
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
 
-#: src/common/plugin.c:777
+#: src/common/plugin.c:778
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 
-#: src/common/plugin.c:786
+#: src/common/plugin.c:787
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 
-#: src/common/plugin.c:788
+#: src/common/plugin.c:789
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
-#: src/common/session.c:201 src/imap.c:1251
+#: src/common/session.c:201 src/imap.c:1312
 msgid "TLS handshake failed\n"
 msgstr ""
 
-#: src/common/smtp.c:185
+#: src/common/smtp.c:187
 msgid "No SMTP AUTH method available\n"
 msgstr ""
 
-#: src/common/smtp.c:188
+#: src/common/smtp.c:190
 msgid "Selected SMTP AUTH method not available\n"
 msgstr ""
 
-#: src/common/smtp.c:539 src/common/smtp.c:594
+#: src/common/smtp.c:544 src/common/smtp.c:601
 msgid "bad SMTP response\n"
 msgstr ""
 
-#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
+#: src/common/smtp.c:572 src/common/smtp.c:590 src/common/smtp.c:707
 msgid "error occurred on SMTP session\n"
 msgstr ""
 
-#: src/common/smtp.c:574 src/pop.c:934
+#: src/common/smtp.c:581 src/pop.c:992
 msgid "error occurred on authentication\n"
 msgstr ""
 
-#: src/common/smtp.c:624
+#: src/common/smtp.c:631
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 
-#: src/common/smtp.c:656 src/pop.c:927
+#: src/common/smtp.c:663 src/pop.c:985
 msgid "couldn't start STARTTLS session\n"
 msgstr ""
 
-#: src/common/socket.c:566
+#: src/common/socket.c:565
 msgid "Socket IO timeout.\n"
 msgstr ""
 
-#: src/common/socket.c:595
+#: src/common/socket.c:594
 msgid "Connection timed out.\n"
 msgstr ""
 
-#: src/common/socket.c:735
+#: src/common/socket.c:734
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr ""
 
-#: src/common/socket.c:975
+#: src/common/socket.c:974
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr ""
 
-#: src/common/socket.c:1067
+#: src/common/socket.c:1066
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr ""
 
-#: src/common/socket.c:1380
+#: src/common/socket.c:1383
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr ""
@@ -1335,307 +1336,307 @@ msgstr ""
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:636
+#: src/common/ssl_certificate.c:635
 msgid "Internal error"
 msgstr ""
 
-#: src/common/ssl_certificate.c:641
+#: src/common/ssl_certificate.c:640
 msgid "Uncheckable"
 msgstr ""
 
-#: src/common/ssl_certificate.c:645
+#: src/common/ssl_certificate.c:644
 msgid "Self-signed certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:648
+#: src/common/ssl_certificate.c:647
 msgid "Revoked certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:650
+#: src/common/ssl_certificate.c:649
 msgid "No certificate issuer found"
 msgstr ""
 
-#: src/common/ssl_certificate.c:652
+#: src/common/ssl_certificate.c:651
 msgid "Certificate issuer is not a CA"
 msgstr ""
 
-#: src/common/ssl_certificate.c:877
+#: src/common/ssl_certificate.c:876
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:881
+#: src/common/ssl_certificate.c:880
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:900
+#: src/common/ssl_certificate.c:899
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:904
+#: src/common/ssl_certificate.c:903
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1052
+#: src/common/ssl_certificate.c:1051
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1055
+#: src/common/ssl_certificate.c:1054
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1059
+#: src/common/ssl_certificate.c:1058
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1084 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1083 src/gtk/sslcertwindow.c:85
 #: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
 #: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
 #: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr ""
 
-#: src/common/string_match.c:81
+#: src/common/string_match.c:68
 msgid "(Subject cleared by RegExp)"
 msgstr ""
 
-#: src/common/utils.c:184
+#: src/common/utils.c:183
 #, c-format
 msgid "%dB"
 msgstr ""
 
-#: src/common/utils.c:185
+#: src/common/utils.c:184
 #, c-format
 msgid "%d.%02dKiB"
 msgstr ""
 
-#: src/common/utils.c:186
+#: src/common/utils.c:185
 #, c-format
 msgid "%d.%02dMiB"
 msgstr ""
 
-#: src/common/utils.c:187
+#: src/common/utils.c:186
 #, c-format
 msgid "%.2fGiB"
 msgstr ""
 
-#: src/common/utils.c:4118
+#: src/common/utils.c:4104
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr ""
 
-#: src/common/utils.c:4119
+#: src/common/utils.c:4105
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr ""
 
-#: src/common/utils.c:4120
+#: src/common/utils.c:4106
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr ""
 
-#: src/common/utils.c:4121
+#: src/common/utils.c:4107
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr ""
 
-#: src/common/utils.c:4122
+#: src/common/utils.c:4108
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr ""
 
-#: src/common/utils.c:4123
+#: src/common/utils.c:4109
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr ""
 
-#: src/common/utils.c:4124
+#: src/common/utils.c:4110
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr ""
 
-#: src/common/utils.c:4126
+#: src/common/utils.c:4112
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr ""
 
-#: src/common/utils.c:4127
+#: src/common/utils.c:4113
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr ""
 
-#: src/common/utils.c:4128
+#: src/common/utils.c:4114
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr ""
 
-#: src/common/utils.c:4129
+#: src/common/utils.c:4115
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr ""
 
-#: src/common/utils.c:4130
+#: src/common/utils.c:4116
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4131
+#: src/common/utils.c:4117
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr ""
 
-#: src/common/utils.c:4132
+#: src/common/utils.c:4118
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr ""
 
-#: src/common/utils.c:4133
+#: src/common/utils.c:4119
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr ""
 
-#: src/common/utils.c:4134
+#: src/common/utils.c:4120
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr ""
 
-#: src/common/utils.c:4135
+#: src/common/utils.c:4121
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr ""
 
-#: src/common/utils.c:4136
+#: src/common/utils.c:4122
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr ""
 
-#: src/common/utils.c:4137
+#: src/common/utils.c:4123
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr ""
 
-#: src/common/utils.c:4139
+#: src/common/utils.c:4125
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr ""
 
-#: src/common/utils.c:4140
+#: src/common/utils.c:4126
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr ""
 
-#: src/common/utils.c:4141
+#: src/common/utils.c:4127
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr ""
 
-#: src/common/utils.c:4142
+#: src/common/utils.c:4128
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr ""
 
-#: src/common/utils.c:4143
+#: src/common/utils.c:4129
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr ""
 
-#: src/common/utils.c:4144
+#: src/common/utils.c:4130
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr ""
 
-#: src/common/utils.c:4145
+#: src/common/utils.c:4131
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr ""
 
-#: src/common/utils.c:4147
+#: src/common/utils.c:4133
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr ""
 
-#: src/common/utils.c:4148
+#: src/common/utils.c:4134
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr ""
 
-#: src/common/utils.c:4149
+#: src/common/utils.c:4135
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr ""
 
-#: src/common/utils.c:4150
+#: src/common/utils.c:4136
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr ""
 
-#: src/common/utils.c:4151
+#: src/common/utils.c:4137
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4152
+#: src/common/utils.c:4138
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr ""
 
-#: src/common/utils.c:4153
+#: src/common/utils.c:4139
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr ""
 
-#: src/common/utils.c:4154
+#: src/common/utils.c:4140
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr ""
 
-#: src/common/utils.c:4155
+#: src/common/utils.c:4141
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr ""
 
-#: src/common/utils.c:4156
+#: src/common/utils.c:4142
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr ""
 
-#: src/common/utils.c:4157
+#: src/common/utils.c:4143
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr ""
 
-#: src/common/utils.c:4158
+#: src/common/utils.c:4144
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr ""
 
-#: src/common/utils.c:4169
+#: src/common/utils.c:4155
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr ""
 
-#: src/common/utils.c:4170
+#: src/common/utils.c:4156
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr ""
 
-#: src/common/utils.c:4171
+#: src/common/utils.c:4157
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr ""
 
-#: src/common/utils.c:4172
+#: src/common/utils.c:4158
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr ""
 
-#: src/compose.c:200
+#: src/compose.c:197
 msgid ""
 "You have opted to sign and/or encrypt this message but have not selected a "
 "privacy system.\n"
@@ -1643,24 +1644,24 @@ msgid ""
 "Signing and encrypting have been disabled for this message."
 msgstr ""
 
-#: src/compose.c:604
+#: src/compose.c:602
 msgid "_Add..."
 msgstr ""
 
-#: 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/compose.c:603 src/editgroup.c:373 src/mh_gtk.c:376
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:356
+#: src/prefs_actions.c:336 src/prefs_display_header.c:377
 #: 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
+#: src/prefs_summary_open.c:246 src/prefs_themes.c:1179
 msgid "_Remove"
 msgstr ""
 
-#: src/compose.c:607 src/folderview.c:255
+#: src/compose.c:605 src/folderview.c:258
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:614 src/mainwindow.c:520 src/messageview.c:215
+#: src/compose.c:614 src/mainwindow.c:519 src/messageview.c:215
 msgid "_Message"
 msgstr ""
 
@@ -1672,7 +1673,7 @@ msgstr ""
 msgid "_Options"
 msgstr ""
 
-#: src/compose.c:621 src/mainwindow.c:523 src/messageview.c:217
+#: src/compose.c:621 src/mainwindow.c:522 src/messageview.c:217
 msgid "_Help"
 msgstr ""
 
@@ -1732,7 +1733,7 @@ msgstr ""
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:652 src/mainwindow.c:553
+#: src/compose.c:652 src/mainwindow.c:552
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
@@ -1837,47 +1838,47 @@ msgstr ""
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:698 src/mainwindow.c:615 src/messageview.c:268
+#: src/compose.c:698 src/mainwindow.c:614 src/messageview.c:268
 msgid "Character _encoding"
 msgstr ""
 
-#: src/compose.c:703 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:703 src/mainwindow.c:619 src/messageview.c:273
 msgid "Western European"
 msgstr ""
 
-#: src/compose.c:704 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:704 src/mainwindow.c:620 src/messageview.c:274
 msgid "Baltic"
 msgstr ""
 
-#: src/compose.c:705 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:705 src/mainwindow.c:621 src/messageview.c:275
 msgid "Hebrew"
 msgstr ""
 
-#: src/compose.c:706 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:706 src/mainwindow.c:622 src/messageview.c:276
 msgid "Arabic"
 msgstr ""
 
-#: src/compose.c:707 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:707 src/mainwindow.c:623 src/messageview.c:277
 msgid "Cyrillic"
 msgstr ""
 
-#: src/compose.c:708 src/mainwindow.c:625 src/messageview.c:278
+#: src/compose.c:708 src/mainwindow.c:624 src/messageview.c:278
 msgid "Japanese"
 msgstr ""
 
-#: src/compose.c:709 src/mainwindow.c:626 src/messageview.c:279
+#: src/compose.c:709 src/mainwindow.c:625 src/messageview.c:279
 msgid "Chinese"
 msgstr ""
 
-#: src/compose.c:710 src/mainwindow.c:627 src/messageview.c:280
+#: src/compose.c:710 src/mainwindow.c:626 src/messageview.c:280
 msgid "Korean"
 msgstr ""
 
-#: src/compose.c:711 src/mainwindow.c:628 src/messageview.c:281
+#: src/compose.c:711 src/mainwindow.c:627 src/messageview.c:281
 msgid "Thai"
 msgstr ""
 
-#: src/compose.c:714 src/mainwindow.c:738 src/messageview.c:317
+#: src/compose.c:714 src/mainwindow.c:736 src/messageview.c:317
 msgid "_Address book"
 msgstr ""
 
@@ -1885,11 +1886,11 @@ msgstr ""
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:718 src/mainwindow.c:768 src/messageview.c:339
+#: src/compose.c:718 src/mainwindow.c:766 src/messageview.c:339
 msgid "Actio_ns"
 msgstr ""
 
-#: src/compose.c:722 src/mainwindow.c:822 src/messageview.c:343
+#: src/compose.c:722 src/mainwindow.c:820 src/messageview.c:343
 msgid "_About"
 msgstr ""
 
@@ -1925,12 +1926,12 @@ msgstr ""
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:739 src/mainwindow.c:669 src/messageview.c:306
+#: src/compose.c:739 src/mainwindow.c:668 src/messageview.c:306
 #: src/summaryview.c:429
 msgid "_All"
 msgstr ""
 
-#: src/compose.c:740 src/mainwindow.c:670 src/messageview.c:307
+#: src/compose.c:740 src/mainwindow.c:669 src/messageview.c:307
 #: src/summaryview.c:430
 msgid "_Sender"
 msgstr ""
@@ -1955,27 +1956,27 @@ msgstr ""
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:755 src/mainwindow.c:887 src/messageview.c:356
+#: src/compose.c:755 src/mainwindow.c:885 src/messageview.c:356
 msgid "_Automatic"
 msgstr ""
 
-#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:357
+#: src/compose.c:756 src/mainwindow.c:886 src/messageview.c:357
 msgid "7bit ASCII (US-ASC_II)"
 msgstr ""
 
-#: src/compose.c:757 src/mainwindow.c:889 src/messageview.c:358
+#: src/compose.c:757 src/mainwindow.c:887 src/messageview.c:358
 msgid "Unicode (_UTF-8)"
 msgstr ""
 
-#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:362
+#: src/compose.c:761 src/mainwindow.c:891 src/messageview.c:362
 msgid "Central European (ISO-8859-_2)"
 msgstr ""
 
-#: src/compose.c:764 src/mainwindow.c:896 src/messageview.c:365
+#: src/compose.c:764 src/mainwindow.c:894 src/messageview.c:365
 msgid "Greek (ISO-8859-_7)"
 msgstr ""
 
-#: src/compose.c:769 src/mainwindow.c:901 src/messageview.c:370
+#: src/compose.c:769 src/mainwindow.c:899 src/messageview.c:370
 msgid "Turkish (ISO-8859-_9)"
 msgstr ""
 
@@ -2007,61 +2008,61 @@ msgstr ""
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1809 src/compose.c:2010 src/quote_fmt.c:602
+#: src/compose.c:1819 src/compose.c:2020 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1870 src/quote_fmt.c:605
+#: src/compose.c:1880 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2053
+#: src/compose.c:2063
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2575
+#: src/compose.c:2585
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2646 src/gtk/headers.h:14
+#: src/compose.c:2658 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2649 src/gtk/headers.h:15
+#: src/compose.c:2661 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2652 src/gtk/headers.h:12
+#: src/compose.c:2664 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2655 src/compose.c:5039 src/compose.c:5041
+#: src/compose.c:2667 src/compose.c:5051 src/compose.c:5053
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2658 src/gtk/headers.h:34
+#: src/compose.c:2670 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2661 src/gtk/headers.h:17
+#: src/compose.c:2673 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2665 src/compose.c:5036 src/compose.c:5044
+#: src/compose.c:2677 src/compose.c:5048 src/compose.c:5056
 #: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr ""
 
-#: src/compose.c:2861
+#: src/compose.c:2873
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2867
+#: src/compose.c:2879 src/compose.c:10987
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -2072,134 +2073,134 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3147
+#: src/compose.c:3158
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3680
+#: src/compose.c:3691
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3698
+#: src/compose.c:3709
 #, 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:3701
+#: src/compose.c:3712
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3702 src/compose.c:10831 src/compose.c:11731
+#: src/compose.c:3713 src/compose.c:10848 src/compose.c:11885
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3827
+#: src/compose.c:3842
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3828
+#: src/compose.c:3843
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3829
+#: src/compose.c:3844
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3838
+#: src/compose.c:3853
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3865
+#: src/compose.c:3880
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4880 src/plugins/managesieve/sieve_editor.c:697
+#: src/compose.c:4892 src/plugins/managesieve/sieve_editor.c:697
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4887 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4899 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4890 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4902 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4892 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4904 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4919 src/messageview.c:891
+#: src/compose.c:4931 src/messageview.c:891
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:5136 src/compose.c:5173
+#: src/compose.c:5148 src/compose.c:5185
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 
-#: 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
+#: src/compose.c:5150 src/compose.c:5187 src/compose.c:5225 src/compose.c:5268
+#: src/toolbar.c:496 src/toolbar.c:529
 msgid "Send"
 msgstr ""
 
-#: 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/compose.c:5152 src/compose.c:5189 src/compose.c:5226 src/compose.c:5269
+#: src/compose.c:5834 src/folderview.c:2564 src/messageview.c:862
 #: src/plugins/attachwarner/attachwarner.c:219
-#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3108
+#: src/plugins/keyword_warner/keyword_warner.c:197 src/toolbar.c:3107
 msgid "_Send"
 msgstr ""
 
-#: src/compose.c:5194
+#: src/compose.c:5206
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5209
+#: src/compose.c:5221
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5210 src/compose.c:5253
+#: src/compose.c:5222 src/compose.c:5265
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5211 src/compose.c:5254
+#: src/compose.c:5223 src/compose.c:5266
 #: src/plugins/attachwarner/attachwarner.c:216
 #: src/plugins/keyword_warner/keyword_warner.c:194
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5213 src/compose.c:5256 src/toolbar.c:531
+#: src/compose.c:5225 src/compose.c:5268 src/toolbar.c:530
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5214 src/compose.c:5257
+#: src/compose.c:5226 src/compose.c:5269
 msgid "_Queue"
 msgstr ""
 
-#: src/compose.c:5252
+#: src/compose.c:5264
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr ""
 
-#: src/compose.c:5281
+#: src/compose.c:5293
 msgid "Could not queue message."
 msgstr ""
 
-#: src/compose.c:5284
+#: src/compose.c:5296
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -2207,7 +2208,7 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:5288
+#: src/compose.c:5300
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2215,7 +2216,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5293
+#: src/compose.c:5305
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -2223,34 +2224,34 @@ msgid ""
 "Encryption failed: %s"
 msgstr ""
 
-#: src/compose.c:5298
+#: src/compose.c:5310
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5302
+#: src/compose.c:5314
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
-#: src/compose.c:5365 src/compose.c:5425
+#: src/compose.c:5377 src/compose.c:5437
 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:5421
+#: src/compose.c:5433
 #, c-format
 msgid ""
 "%s\n"
-"Use \"Send queued messages\" from the main window to retry."
+"You can try to \"Send\" again or queue the message with \"Send later\""
 msgstr ""
 
-#: src/compose.c:5818
+#: src/compose.c:5830
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2258,7 +2259,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5876
+#: src/compose.c:5888
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2267,201 +2268,201 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:6115
+#: src/compose.c:6127
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:6116
+#: src/compose.c:6128
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:6165
+#: src/compose.c:6176
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:6174
+#: src/compose.c:6185
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6428
+#: src/compose.c:6439
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6430 src/mainwindow.c:660 src/toolbar.c:280 src/toolbar.c:2605
+#: src/compose.c:6441
+msgid "Cancel drafting"
+msgstr ""
+
+#: src/compose.c:6441 src/mainwindow.c:659 src/toolbar.c:279 src/toolbar.c:2604
 msgid "Cancel sending"
 msgstr ""
 
-#: src/compose.c:6431
+#: src/compose.c:6442
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6487
+#: src/compose.c:6498
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:7094
+#: src/compose.c:7102
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:7249
+#: src/compose.c:7257
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:7253 src/plugins/vcalendar/vcal_meeting_gtk.c:302
+#: src/compose.c:7261 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
-#: src/compose.c:7488
+#: src/compose.c:7496
 msgid "Mime type"
 msgstr ""
 
-#: 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
+#: src/compose.c:7502 src/mimeview.c:310
+#: src/plugins/att_remover/att_remover.c:302
+#: src/plugins/pgpcore/select-keys.c:454 src/prefs_matcher.c:640
+#: src/prefs_summaries.c:700 src/prefs_summary_column.c:84
+#: src/summaryview.c:468
 msgid "Size"
 msgstr ""
 
-#: src/compose.c:7556
+#: src/compose.c:7562
 msgid "Save Message to "
 msgstr ""
 
-#: 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:1078
+#: src/compose.c:7595 src/editjpilot.c:277 src/editldap.c:514
+#: src/editvcard.c:193 src/export.c:161 src/import.c:164 src/importmutt.c:240
+#: src/importpine.c:239 src/plugins/archive/archiver_gtk.c:1077
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:180
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:429 src/prefs_summaries.c:468
 msgid "_Browse"
 msgstr ""
 
-#: src/compose.c:7605
+#: src/compose.c:7611
 msgid "Select folder to save message to"
 msgstr ""
 
-#: src/compose.c:8059
+#: src/compose.c:8065
 msgid "Hea_der"
 msgstr ""
 
-#: src/compose.c:8064
+#: src/compose.c:8070
 msgid "_Attachments"
 msgstr ""
 
-#: src/compose.c:8078
+#: src/compose.c:8084
 msgid "Othe_rs"
 msgstr ""
 
-#: src/compose.c:8093
+#: src/compose.c:8099
 msgid "S_ubject:"
 msgstr ""
 
-#: src/compose.c:8317
+#: src/compose.c:8323
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:8468
+#: src/compose.c:8474
 msgid "_From:"
 msgstr ""
 
-#: src/compose.c:8476
+#: src/compose.c:8482
 msgid "Account to use for this email"
 msgstr ""
 
-#: src/compose.c:8478
+#: src/compose.c:8484
 msgid "Sender address to be used"
 msgstr ""
 
-#: src/compose.c:8660
+#: src/compose.c:8666
 #, 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:8771 src/plugins/archive/archiver_gtk.c:1177
+#: src/compose.c:8777 src/plugins/archive/archiver_gtk.c:1176
 msgid "_None"
 msgstr ""
 
-#: src/compose.c:8872 src/prefs_template.c:745
+#: src/compose.c:8878 src/prefs_template.c:744
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:8969
+#: src/compose.c:8975
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr ""
 
-#: src/compose.c:9394
+#: src/compose.c:9400
 msgid "Invalid MIME type."
 msgstr ""
 
-#: src/compose.c:9409
+#: src/compose.c:9415
 msgid "File doesn't exist or is empty."
 msgstr ""
 
-#: src/compose.c:9480
+#: src/compose.c:9486
 msgid "Properties"
 msgstr ""
 
-#: src/compose.c:9498
+#: src/compose.c:9504
 msgid "MIME type"
 msgstr ""
 
-#: src/compose.c:9531
+#: src/compose.c:9537
 msgid "Encoding"
 msgstr ""
 
-#: src/compose.c:9551
+#: src/compose.c:9557
 msgid "Path"
 msgstr ""
 
-#: src/compose.c:9552
+#: src/compose.c:9558
 msgid "File name"
 msgstr ""
 
-#: src/compose.c:9648
+#: src/compose.c:9654
 #, c-format
 msgid ""
 "Could not write the body to file:\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:9677
-msgid ""
-"Socket communication with an external editor is not available on Windows."
+#: src/compose.c:9688
+msgid "Socket communication with an external editor is only available on X11."
 msgstr ""
 
-#: src/compose.c:9710
+#: src/compose.c:9723
 #, c-format
 msgid ""
-"Could not spawn the following command:\n"
+"Could not spawn the following external editor command:\n"
 "%s\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:9754
+#: src/compose.c:9767
 #, c-format
 msgid "External editor stopped with an error: %s"
 msgstr ""
 
-#: src/compose.c:9828
+#: src/compose.c:9841
 msgid "process id: %"
 msgstr ""
 
-#: src/compose.c:9830
-#, c-format
-msgid "process id: %d"
-msgstr ""
-
-#: src/compose.c:9835
+#: src/compose.c:9844
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2469,99 +2470,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/compose.c:10245 src/messageview.c:1094
+#: src/compose.c:10259 src/messageview.c:1094
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
-#: src/compose.c:10448
+#: src/compose.c:10462
 msgid "Could not save draft."
 msgstr ""
 
-#: src/compose.c:10452
+#: src/compose.c:10466
 msgid "Could not save draft"
 msgstr ""
 
-#: src/compose.c:10453
+#: src/compose.c:10467
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: src/compose.c:10455
+#: src/compose.c:10469
 msgid "_Cancel exit"
 msgstr ""
 
-#: src/compose.c:10455
+#: src/compose.c:10469
 msgid "_Discard email"
 msgstr ""
 
-#: src/compose.c:10643 src/compose.c:10657
+#: src/compose.c:10660 src/compose.c:10674
 msgid "Select file"
 msgstr ""
 
-#: src/compose.c:10671
+#: src/compose.c:10688
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
-#: src/compose.c:10673
+#: src/compose.c:10690
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: src/compose.c:10750
+#: src/compose.c:10767
 msgid "Discard message"
 msgstr ""
 
-#: src/compose.c:10751
+#: src/compose.c:10768
 msgid "This message has been modified. Discard it?"
 msgstr ""
 
-#: src/compose.c:10752 src/plugins/managesieve/sieve_editor.c:435
+#: src/compose.c:10769 src/plugins/managesieve/sieve_editor.c:435
 msgid "_Discard"
 msgstr ""
 
-#: src/compose.c:10752 src/compose.c:10757
+#: src/compose.c:10769 src/compose.c:10774
 msgid "_Save to Drafts"
 msgstr ""
 
-#: src/compose.c:10755 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10772 src/plugins/managesieve/sieve_editor.c:433
 msgid "Save changes"
 msgstr ""
 
-#: src/compose.c:10756
+#: src/compose.c:10773
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/compose.c:10757
+#: src/compose.c:10774
 msgid "_Don't save"
 msgstr ""
 
-#: src/compose.c:10828
+#: src/compose.c:10845
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr ""
 
-#: src/compose.c:10830
+#: src/compose.c:10847
 msgid "Apply template"
 msgstr ""
 
-#: 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/compose.c:10848 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:306
 #: src/prefs_toolbar.c:1004
 msgid "_Replace"
 msgstr ""
 
-#: src/compose.c:10908
+#: src/compose.c:11052
 #, c-format
 msgid ""
-"Size of pasted text exceeds limit (%dKiB) for paste.\n"
-"Attach as file instead."
+"The pasted image has been attached as: \n"
+"%s"
 msgstr ""
 
-#: src/compose.c:11724
+#: src/compose.c:11878
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2572,20 +2573,20 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:11730
+#: src/compose.c:11884
 msgid "Insert or attach?"
 msgstr ""
 
-#: src/compose.c:11731
+#: src/compose.c:11885
 msgid "_Attach"
 msgstr ""
 
-#: src/compose.c:11946
+#: src/compose.c:12100
 #, c-format
 msgid "Quote format error at line %d."
 msgstr ""
 
-#: src/compose.c:12242
+#: src/compose.c:12396
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2612,8 +2613,8 @@ msgstr ""
 msgid "Debug log"
 msgstr ""
 
-#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:504 src/toolbar.c:550
-#: src/uri_opener.c:226
+#: src/crash.c:255 src/expldifdlg.c:202 src/printing.c:507 src/toolbar.c:549
+#: src/uri_opener.c:224
 msgid "Close"
 msgstr ""
 
@@ -2709,7 +2710,7 @@ msgid "Photo"
 msgstr ""
 
 #: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:508
-#: src/exporthtml.c:758 src/ldif.c:751
+#: src/exporthtml.c:751 src/ldif.c:751
 msgid "Display Name"
 msgstr ""
 
@@ -2731,7 +2732,7 @@ msgstr ""
 
 #: 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
+#: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:216
 msgid "Value"
 msgstr ""
 
@@ -2775,7 +2776,7 @@ msgid " Check File "
 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/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2508
 msgid "File"
 msgstr ""
 
@@ -2791,7 +2792,7 @@ msgstr ""
 msgid "Edit group data"
 msgstr ""
 
-#: src/editgroup.c:321 src/exporthtml.c:594
+#: src/editgroup.c:321 src/exporthtml.c:587
 msgid "Group Name"
 msgstr ""
 
@@ -2819,13 +2820,13 @@ msgstr ""
 msgid "Input the new name of folder:"
 msgstr ""
 
-#: 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
+#: src/editgroup.c:546 src/foldersel.c:568 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:124
 msgid "New folder"
 msgstr ""
 
-#: 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
+#: src/editgroup.c:547 src/foldersel.c:569 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:125
 msgid "Input the name of new folder:"
 msgstr ""
 
@@ -2853,13 +2854,13 @@ msgstr ""
 msgid "Edit LDAP - Select Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3190
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3255
 #: 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/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3262
 #: src/prefs_proxy.c:107 src/ssl_manager.c:117
 msgid "Port"
 msgstr ""
@@ -2920,7 +2921,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: src/editldap.c:468 src/prefs_account.c:4171
+#: src/editldap.c:468 src/prefs_account.c:4255
 msgid "TLS"
 msgstr ""
 
@@ -3052,8 +3053,8 @@ msgstr ""
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 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/editldap.c:727 src/prefs_account.c:1476 src/prefs_account.c:2135
+#: src/prefs_account.c:3067 src/prefs_account.c:3095 src/prefs_account.c:3296
 #: src/prefs_proxy.c:144
 msgid "Show password"
 msgstr ""
@@ -3075,11 +3076,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:776 src/prefs_account.c:4044
+#: src/editldap.c:776 src/prefs_account.c:4126
 msgid "Basic"
 msgstr ""
 
-#: src/editldap.c:778 src/gtk/quicksearch.c:878
+#: src/editldap.c:778 src/gtk/quicksearch.c:881
 msgid "Extended"
 msgstr ""
 
@@ -3097,8 +3098,8 @@ 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
+#: src/edittags.c:203 src/gtk/quicksearch.c:869
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:707
 msgid "Tag"
 msgstr ""
 
@@ -3118,23 +3119,23 @@ msgstr ""
 msgid "Do you really want to delete all tags?"
 msgstr ""
 
-#: src/edittags.c:441
+#: src/edittags.c:439
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
 
-#: src/edittags.c:572
+#: src/edittags.c:570
 msgid "New tag:"
 msgstr ""
 
-#: src/edittags.c:584
+#: src/edittags.c:582
 msgid "Add the new tag"
 msgstr ""
 
-#: src/edittags.c:589
+#: src/edittags.c:587
 msgid "Delete the selected tag"
 msgstr ""
 
-#: src/edittags.c:608
+#: src/edittags.c:606
 msgid ""
 "Choose the tag(s) for the message(s).\n"
 "Changes are immediately applied."
@@ -3160,11 +3161,11 @@ msgstr ""
 msgid "Impossible to set the client certificate.\n"
 msgstr ""
 
-#: src/etpan/nntp-thread.c:949
+#: src/etpan/nntp-thread.c:947
 msgid "couldn't get xover range\n"
 msgstr ""
 
-#: src/etpan/nntp-thread.c:1048
+#: src/etpan/nntp-thread.c:1046
 msgid "couldn't get xhdr range\n"
 msgstr ""
 
@@ -3214,30 +3215,30 @@ msgstr ""
 msgid "HTML Output File"
 msgstr ""
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:406 src/export.c:167 src/import.c:166
+#: src/exphtmldlg.c:392 src/expldifdlg.c:406 src/export.c:167 src/import.c:170
 #: src/importldif.c:567
 msgid "B_rowse"
 msgstr ""
 
-#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:302
+#: src/exphtmldlg.c:441 src/plugins/fancy/fancy_prefs.c:276
 msgid "Stylesheet"
 msgstr ""
 
 #: 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:770 src/prefs_toolbar.c:1422 src/summaryview.c:6267
+#: src/gtk/gtkaspell.c:1560 src/gtk/gtkaspell.c:2195 src/gtk/menu.c:126
+#: src/mainwindow.c:1176 src/plugins/archive/archiver_prefs.c:312
+#: src/plugins/libravatar/libravatar_prefs.c:319 src/prefs_account.c:1143
+#: src/prefs_toolbar.c:770 src/prefs_toolbar.c:1420 src/summaryview.c:6268
 msgid "None"
 msgstr ""
 
 #: 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
+#: src/prefs_other.c:320 src/prefs_other.c:431
 msgid "Default"
 msgstr ""
 
-#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:244
+#: src/exphtmldlg.c:450 src/plugins/pgpcore/select-keys.c:242
 #: src/plugins/pgpcore/sgpgme.c:338 src/plugins/pgpcore/sgpgme.c:354
 msgid "Full"
 msgstr ""
@@ -3456,7 +3457,7 @@ msgstr ""
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/export.c:112 src/summaryview.c:8485
+#: src/export.c:112 src/summaryview.c:8490
 msgid "Export to mbox file"
 msgstr ""
 
@@ -3468,12 +3469,12 @@ msgstr ""
 msgid "Source folder:"
 msgstr ""
 
-#: src/export.c:146 src/import.c:142
+#: src/export.c:146 src/import.c:146
 msgid "Mbox file:"
 msgstr ""
 
-#: src/export.c:198
-msgid "Target mbox filename can't be left empty."
+#: src/export.c:198 src/import.c:205
+msgid "Mbox file can't be left empty."
 msgstr ""
 
 #: src/export.c:203
@@ -3492,32 +3493,32 @@ msgstr ""
 msgid "Select folder to export"
 msgstr ""
 
-#: src/exporthtml.c:764
+#: src/exporthtml.c:757
 msgid "Full Name"
 msgstr ""
 
-#: src/exporthtml.c:768 src/importldif.c:966
+#: src/exporthtml.c:761 src/importldif.c:966
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr ""
 
-#: src/exporthtml.c:971
+#: src/exporthtml.c:964
 msgid "Claws Mail Address Book"
 msgstr ""
 
-#: src/exporthtml.c:1066 src/exportldif.c:607
+#: src/exporthtml.c:1059 src/exportldif.c:598
 msgid "Name already exists but is not a directory."
 msgstr ""
 
-#: src/exporthtml.c:1069 src/exportldif.c:610
+#: src/exporthtml.c:1062 src/exportldif.c:601
 msgid "No permissions to create directory."
 msgstr ""
 
-#: src/exporthtml.c:1072 src/exportldif.c:613
+#: src/exporthtml.c:1065 src/exportldif.c:604
 msgid "Name is too long."
 msgstr ""
 
-#: src/exporthtml.c:1075 src/exportldif.c:616
+#: src/exporthtml.c:1068 src/exportldif.c:607
 msgid "Not specified."
 msgstr ""
 
@@ -3538,134 +3539,149 @@ msgid ""
 "%s?"
 msgstr ""
 
-#: src/filtering.c:606 src/filtering.c:681 src/filtering.c:710
+#: src/filtering.c:608 src/filtering.c:690 src/filtering.c:722
 msgid "rule is not account-based\n"
 msgstr ""
 
-#: src/filtering.c:610
+#: src/filtering.c:615
+msgid ""
+"rule is account-based, matching the account currently used to retrieve "
+"messages\n"
+msgstr ""
+
+#: src/filtering.c:621
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], matching the account currently "
 "used to retrieve messages\n"
 msgstr ""
 
-#: 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
+#: src/filtering.c:623 src/filtering.c:641 src/filtering.c:642
+#: src/filtering.c:675 src/filtering.c:706 src/filtering.c:738
+#: src/filtering.c:739 src/filtering.c:757 src/filtering.c:758
 msgid "NON_EXISTENT"
 msgstr ""
 
-#: src/filtering.c:620
+#: src/filtering.c:631
 msgid ""
 "rule is account-based, not matching the account currently used to retrieve "
 "messages\n"
 msgstr ""
 
-#: src/filtering.c:627
+#: src/filtering.c:639
 #, 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:646
+#: src/filtering.c:658
 msgid ""
-"rule is not account-based, all rules are applied on user request anyway\n"
+"rule is not account-based, but all rules are applied on user request anyway\n"
 msgstr ""
 
-#: src/filtering.c:652
+#: src/filtering.c:665
+msgid ""
+"rule is account-based, but all rules are applied on user request anyway\n"
+msgstr ""
+
+#: src/filtering.c:673
 #, c-format
 msgid ""
 "rule is account-based [id=%d, name='%s'], but all rules are applied on user "
-"request\n"
+"request anyway\n"
+msgstr ""
+
+#: src/filtering.c:696
+msgid "rule is account-based, skipped on user request\n"
 msgstr ""
 
-#: src/filtering.c:670
+#: src/filtering.c:704
 #, c-format
 msgid "rule is account-based [id=%d, name='%s'], skipped on user request\n"
 msgstr ""
 
-#: src/filtering.c:675
-msgid "rule is account-based, skipped on user request\n"
+#: src/filtering.c:728
+msgid "rule is account-based, matching current account\n"
 msgstr ""
 
-#: src/filtering.c:697
+#: src/filtering.c:736
 #, 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'], matching current account [id=%d, "
+"name='%s']\n"
 msgstr ""
 
-#: src/filtering.c:703
+#: src/filtering.c:747
 msgid "rule is account-based, not matching current account\n"
 msgstr ""
 
-#: src/filtering.c:715
+#: src/filtering.c:755
 #, c-format
 msgid ""
-"rule is account-based [id=%d, name='%s'], 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:755
+#: src/filtering.c:795
 #, c-format
 msgid "applying action [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:760
+#: src/filtering.c:800
 msgid "action could not apply\n"
 msgstr ""
 
-#: src/filtering.c:762
+#: src/filtering.c:802
 #, c-format
 msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:823
+#: src/filtering.c:863
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:827
+#: src/filtering.c:867
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:845
+#: src/filtering.c:885
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:849
+#: src/filtering.c:889
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:887
+#: src/filtering.c:927
 msgid "undetermined"
 msgstr ""
 
-#: src/filtering.c:891
+#: src/filtering.c:931
 msgid "incorporation"
 msgstr ""
 
-#: src/filtering.c:895
+#: src/filtering.c:935
 msgid "manually"
 msgstr ""
 
-#: src/filtering.c:899
+#: src/filtering.c:939
 msgid "folder processing"
 msgstr ""
 
-#: src/filtering.c:903
+#: src/filtering.c:943
 msgid "pre-processing"
 msgstr ""
 
-#: src/filtering.c:907
+#: src/filtering.c:947
 msgid "post-processing"
 msgstr ""
 
-#: src/filtering.c:922
+#: src/filtering.c:962
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3676,72 +3692,72 @@ msgid ""
 "%s%s %s\n"
 msgstr ""
 
-#: src/filtering.c:924 src/filtering.c:933
+#: src/filtering.c:964 src/filtering.c:973
 msgid ": "
 msgstr ""
 
-#: src/filtering.c:931
+#: src/filtering.c:971
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
 
-#: src/folder.c:1596 src/prefs_folder_item.c:324
+#: src/folder.c:1592 src/prefs_folder_item.c:324
 msgid "Inbox"
 msgstr ""
 
-#: src/folder.c:1600
+#: src/folder.c:1596 src/prefs_folder_item.c:325
 msgid "Sent"
 msgstr ""
 
-#: src/folder.c:1604 src/plugins/attachwarner/attachwarner.c:219
+#: src/folder.c:1600 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:1608 src/prefs_folder_item.c:328
+#: src/folder.c:1604 src/prefs_folder_item.c:328
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/folder.c:1612 src/prefs_folder_item.c:326
+#: src/folder.c:1608 src/prefs_folder_item.c:326
 msgid "Drafts"
 msgstr ""
 
-#: src/folder.c:2043
+#: src/folder.c:2039
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3295
+#: src/folder.c:3291
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3613
+#: src/folder.c:3609
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4478
+#: src/folder.c:4474
 msgid "Processing messages..."
 msgstr ""
 
-#: src/folder.c:4613
+#: src/folder.c:4609
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr ""
 
-#: src/folder.c:4872
+#: src/folder.c:4868
 msgid "A folder name cannot begin or end with a dot."
 msgstr ""
 
-#: src/folder.c:4876
+#: src/folder.c:4872
 msgid "A folder name can not end with a space."
 msgstr ""
 
@@ -3749,281 +3765,289 @@ msgstr ""
 msgid "Select folder"
 msgstr ""
 
-#: 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
+#: src/foldersel.c:570 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:126
 msgid "NewFolder"
 msgstr ""
 
-#: src/foldersel.c:573 src/imap_gtk.c:198 src/mh_gtk.c:147
+#: src/foldersel.c:571 src/imap_gtk.c:198 src/mh_gtk.c:147
 msgid "Inherit properties and processing rules from parent folder"
 msgstr ""
 
-#: src/foldersel.c:583 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:581 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
+#: src/plugins/rssyl/rssyl_cb_menu.c:235
+#: src/plugins/vcalendar/vcal_folder.c:2099
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
-#: src/foldersel.c:598 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:596 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
+#: src/plugins/mailmbox/plugin_gtk.c:446 src/plugins/rssyl/rssyl_cb_menu.c:247
+#: src/plugins/vcalendar/vcal_folder.c:2106
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
-#: 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:162
+#: src/foldersel.c:603 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:87
+#: src/plugins/rssyl/rssyl_cb_menu.c:157
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 
-#: src/folderview.c:248
+#: src/folderview.c:250
 msgid "Mark all re_ad"
 msgstr ""
 
-#: src/folderview.c:249
+#: src/folderview.c:251
 msgid "Mark all u_nread"
 msgstr ""
 
-#: src/folderview.c:250
+#: src/folderview.c:252
 msgid "Mark all read recursi_vely"
 msgstr ""
 
-#: src/folderview.c:251
+#: src/folderview.c:253
 msgid "Mark all unread recursi_vely"
 msgstr ""
 
-#: src/folderview.c:253
+#: src/folderview.c:255
 msgid "R_un processing rules"
 msgstr ""
 
-#: src/folderview.c:254 src/mainwindow.c:557
+#: src/folderview.c:256 src/mainwindow.c:556
 msgid "_Search folder..."
 msgstr ""
 
-#: src/folderview.c:256
+#: src/folderview.c:257
+msgid "Open on start-up"
+msgstr ""
+
+#: src/folderview.c:259
 msgid "Process_ing..."
 msgstr ""
 
-#: src/folderview.c:257
+#: src/folderview.c:260
 msgid "Empty _trash..."
 msgstr "Empty was_tebin..."
 
-#: src/folderview.c:258
+#: src/folderview.c:261
 msgid "Send _queue..."
 msgstr ""
 
-#: src/folderview.c:265
+#: src/folderview.c:268
 msgid "Set Displayed columns"
 msgstr ""
 
-#: src/folderview.c:404 src/folderview.c:451
+#: src/folderview.c:407 src/folderview.c:454
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6535
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6536
 msgid "New"
 msgstr ""
 
-#: src/folderview.c:405 src/folderview.c:452
+#: src/folderview.c:408 src/folderview.c:455
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6537
-#: src/toolbar.c:522
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6538
+#: src/toolbar.c:521
 msgid "Unread"
 msgstr ""
 
-#: src/folderview.c:406 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:409 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:454 src/summaryview.c:469
+#: src/folderview.c:457 src/summaryview.c:469
 msgid "#"
 msgstr "No."
 
-#: src/folderview.c:785
+#: src/folderview.c:788
 msgid "Setting folder info..."
 msgstr ""
 
-#: src/folderview.c:870 src/summaryview.c:4272
+#: src/folderview.c:873 src/summaryview.c:4273
 msgid "Mark all as read"
 msgstr ""
 
-#: src/folderview.c:871
+#: src/folderview.c:874
+#, fuzzy
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "read?"
 msgstr ""
+"Do you really want to apply this colour label to all selected messages?"
 
-#: src/folderview.c:873 src/summaryview.c:4273
+#: src/folderview.c:876 src/summaryview.c:4274
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 
-#: src/folderview.c:876 src/summaryview.c:4318
+#: src/folderview.c:879 src/summaryview.c:4319
 msgid "Mark all as unread"
 msgstr ""
 
-#: src/folderview.c:877
+#: src/folderview.c:880
+#, fuzzy
 msgid ""
-"Do you really want to mark all mails in this folder and its sub-folders as "
+"Do you really want to mark all mails in this folder and its subfolders as "
 "unread?"
 msgstr ""
+"Do you really want to apply this colour label to all selected messages?"
 
-#: src/folderview.c:879 src/summaryview.c:4319
+#: src/folderview.c:882 src/summaryview.c:4320
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 
-#: src/folderview.c:1075 src/imap.c:4693
+#: src/folderview.c:1078 src/imap.c:4756
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr ""
 
-#: src/folderview.c:1078 src/imap.c:4697 src/mainwindow.c:5270 src/setup.c:96
+#: src/folderview.c:1081 src/imap.c:4760 src/mainwindow.c:5263 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s..."
 msgstr ""
 
-#: src/folderview.c:1109
+#: src/folderview.c:1112
 msgid "Rebuild folder tree"
 msgstr ""
 
-#: src/folderview.c:1110
+#: src/folderview.c:1113
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
-#: src/folderview.c:1120
+#: src/folderview.c:1123
 msgid "Rebuilding folder tree..."
 msgstr ""
 
-#: src/folderview.c:1122
+#: src/folderview.c:1125
 msgid "Scanning folder tree..."
 msgstr ""
 
-#: src/folderview.c:1212
+#: src/folderview.c:1214
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
-#: src/folderview.c:1266
+#: src/folderview.c:1267
 msgid "Checking for new messages in all folders..."
 msgstr ""
 
-#: src/folderview.c:2235
+#: src/folderview.c:2244
 #, c-format
 msgid "Closing folder %s..."
 msgstr ""
 
-#: src/folderview.c:2337
+#: src/folderview.c:2346
 #, c-format
 msgid "Opening folder %s..."
 msgstr ""
 
-#: src/folderview.c:2355
+#: src/folderview.c:2364
 msgid "Folder could not be opened."
 msgstr ""
 
-#: src/folderview.c:2495 src/mainwindow.c:2870 src/mainwindow.c:2875
+#: src/folderview.c:2504 src/mainwindow.c:2862 src/mainwindow.c:2867
 msgid "Empty trash"
 msgstr "Empty wastebin"
 
-#: src/folderview.c:2496
+#: src/folderview.c:2505
 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 
-#: src/folderview.c:2497
+#: src/folderview.c:2506
 msgid "_Empty trash"
 msgstr "_Empty wastebin"
 
-#: src/folderview.c:2541 src/inc.c:1671 src/toolbar.c:3086
+#: src/folderview.c:2550 src/inc.c:1674 src/toolbar.c:3085
 msgid "Offline warning"
 msgstr ""
 
-#: src/folderview.c:2542 src/toolbar.c:3087
+#: src/folderview.c:2551 src/toolbar.c:3086
 msgid "You're working offline. Override?"
 msgstr ""
 
-#: src/folderview.c:2553 src/toolbar.c:3106
+#: src/folderview.c:2562 src/toolbar.c:3105
 msgid "Send queued messages"
 msgstr ""
 
-#: src/folderview.c:2554 src/toolbar.c:3107
+#: src/folderview.c:2563 src/toolbar.c:3106
 msgid "Send all queued messages?"
 msgstr ""
 
-#: src/folderview.c:2563 src/toolbar.c:3126
+#: src/folderview.c:2572 src/toolbar.c:3125
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
-#: src/folderview.c:2566 src/main.c:2922 src/toolbar.c:3129
+#: src/folderview.c:2575 src/main.c:2846 src/toolbar.c:3128
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
-#: src/folderview.c:2647
+#: src/folderview.c:2670
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr ""
 
-#: src/folderview.c:2648
+#: src/folderview.c:2671
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr ""
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Copy folder"
 msgstr ""
 
-#: src/folderview.c:2650
+#: src/folderview.c:2673
 msgid "Move folder"
 msgstr ""
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2661
+#: src/folderview.c:2684
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2695
+#: src/folderview.c:2718
 msgid "Source and destination are the same."
 msgstr ""
 
-#: src/folderview.c:2698
+#: src/folderview.c:2721
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2699
+#: src/folderview.c:2722
 msgid "Can't move a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2702
+#: src/folderview.c:2725
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Copy failed!"
 msgstr ""
 
-#: src/folderview.c:2705
+#: src/folderview.c:2728
 msgid "Move failed!"
 msgstr ""
 
-#: src/folderview.c:2755
+#: src/folderview.c:2778
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
-#: src/folderview.c:3180 src/summaryview.c:4727 src/summaryview.c:4833
+#: src/folderview.c:3203 src/summaryview.c:4728 src/summaryview.c:4834
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 
@@ -4051,7 +4075,7 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:214 src/plugins/att_remover/att_remover.c:301
 msgid "Type"
 msgstr ""
 
@@ -4067,9 +4091,9 @@ msgstr ""
 msgid "read-only"
 msgstr ""
 
-#: 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
+#: src/grouplistdialog.c:358 src/plugins/att_remover/att_remover.c:299
+#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "unknown"
 msgstr ""
 
@@ -4077,7 +4101,7 @@ msgstr ""
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
-#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1667
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1738 src/summaryview.c:1670
 msgid "Done."
 msgstr ""
 
@@ -4105,9 +4129,9 @@ msgid ""
 "the Claws Mail project you can do so at:"
 msgstr ""
 
-#: src/gtk/about.c:164 src/gtk/about.c:862
+#: src/gtk/about.c:164 src/gtk/about.c:876
 msgid ""
-"Copyright (C) 1999-2022\n"
+"Copyright (C) 1999-2024\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -4137,7 +4161,7 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 
-#: src/gtk/about.c:254 src/prefs_themes.c:940 src/wizard.c:528
+#: src/gtk/about.c:254 src/prefs_themes.c:919 src/wizard.c:528
 msgid "The Claws Mail Team"
 msgstr ""
 
@@ -4185,53 +4209,58 @@ msgid "adds support for encrypted connections to servers\n"
 msgstr ""
 
 #: src/gtk/about.c:463
-msgctxt "IPv6"
-msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
-msgstr ""
-
-#: src/gtk/about.c:474
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr ""
 
-#: src/gtk/about.c:484
+#: src/gtk/about.c:473
+msgctxt "IPv6"
+msgid "adds support for IPv6 addresses\n"
+msgstr ""
+
+#: src/gtk/about.c:483
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:494
+#: src/gtk/about.c:493
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:504
+#: src/gtk/about.c:503
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr ""
 
-#: src/gtk/about.c:514
+#: src/gtk/about.c:513
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr ""
+
+#: src/gtk/about.c:523
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr ""
 
-#: src/gtk/about.c:524
+#: src/gtk/about.c:533
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr ""
 
-#: src/gtk/about.c:534
-msgctxt "librSVG"
-msgid "adds support for SVG themes\n"
+#: src/gtk/about.c:543
+msgctxt "OAuth2"
+msgid "adds support for OAuth2 authentication\n"
 msgstr ""
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:576
 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:574
+#: src/gtk/about.c:583
 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 "
@@ -4239,139 +4268,144 @@ msgid ""
 "more details."
 msgstr ""
 
-#: src/gtk/about.c:592
+#: src/gtk/about.c:601
 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:727 src/main.c:2746
+#: src/gtk/about.c:736 src/main.c:2661
 msgid "Session statistics\n"
 msgstr ""
 
-#: src/gtk/about.c:737 src/gtk/about.c:740 src/main.c:2756 src/main.c:2759
+#: src/gtk/about.c:746 src/gtk/about.c:749 src/main.c:2671 src/main.c:2674
 #, c-format
 msgid "Started: %s\n"
 msgstr ""
 
-#: src/gtk/about.c:747 src/main.c:2765
+#: src/gtk/about.c:756 src/main.c:2680
 msgid "Incoming traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:750 src/main.c:2768
+#: src/gtk/about.c:759 src/main.c:2683
 #, c-format
 msgid "Received messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:757 src/main.c:2774
+#: src/gtk/about.c:764 src/main.c:2688
+#, c-format
+msgid "Spam messages: %d\n"
+msgstr ""
+
+#: src/gtk/about.c:771 src/main.c:2695
 msgid "Outgoing traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:760 src/main.c:2777
+#: src/gtk/about.c:774 src/main.c:2698
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:765 src/main.c:2781
+#: src/gtk/about.c:779 src/main.c:2702
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:770 src/main.c:2785
+#: src/gtk/about.c:784 src/main.c:2706
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:775 src/main.c:2789
+#: src/gtk/about.c:789 src/main.c:2710
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:802
+#: src/gtk/about.c:816
 msgid "About Claws Mail"
 msgstr ""
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:891
 msgid "_Info"
 msgstr ""
 
-#: src/gtk/about.c:883
+#: src/gtk/about.c:897
 msgid "_Authors"
 msgstr ""
 
-#: src/gtk/about.c:889
+#: src/gtk/about.c:903
 msgid "_Features"
 msgstr ""
 
-#: src/gtk/about.c:895
+#: src/gtk/about.c:909
 msgid "_License"
 msgstr ""
 
-#: src/gtk/about.c:903
+#: src/gtk/about.c:917
 msgid "_Release Notes"
 msgstr ""
 
-#: src/gtk/about.c:909
+#: src/gtk/about.c:923
 msgid "_Statistics"
 msgstr ""
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:364
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr ""
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:368
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:372
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:376
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:380
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:384
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:388
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:392
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr ""
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:396
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:400
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:404
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:408
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:412
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr ""
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:416
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:420
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr ""
 
@@ -4395,99 +4429,99 @@ msgstr ""
 msgid "Move the selected mailbox down"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:341 src/gtk/gtkaspell.c:660
+#: src/gtk/gtkaspell.c:340 src/gtk/gtkaspell.c:658
 msgid "No dictionary selected."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:365 src/gtk/gtkaspell.c:395
+#: src/gtk/gtkaspell.c:364 src/gtk/gtkaspell.c:394
 #, c-format
 msgid "Couldn't initialize %s speller."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:707
+#: src/gtk/gtkaspell.c:700
 msgid "Couldn't initialize Enchant broker."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:713
+#: src/gtk/gtkaspell.c:706
 #, c-format
 msgid "Couldn't initialize %s dictionary:"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1067
+#: src/gtk/gtkaspell.c:1060
 msgid "No misspelled word found."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1436
 msgid "Replace unknown word"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1459
+#: src/gtk/gtkaspell.c:1452
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1504
+#: src/gtk/gtkaspell.c:1497
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1801 src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1794 src/gtk/gtkaspell.c:1931
 msgid "More..."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1857
+#: src/gtk/gtkaspell.c:1850
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1872
+#: src/gtk/gtkaspell.c:1865
 msgid "Accept in this session"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1882
+#: src/gtk/gtkaspell.c:1875
 msgid "Add to personal dictionary"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1892
+#: src/gtk/gtkaspell.c:1885
 msgid "Replace with..."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1905
+#: src/gtk/gtkaspell.c:1898
 #, c-format
 msgid "Check with %s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1927
+#: src/gtk/gtkaspell.c:1920
 msgid "(no suggestions)"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2001
+#: src/gtk/gtkaspell.c:1994
 #, c-format
 msgid "Dictionary: %s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2015
+#: src/gtk/gtkaspell.c:2008
 #, c-format
 msgid "Use alternate (%s)"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2026
+#: src/gtk/gtkaspell.c:2019
 msgid "Use both dictionaries"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2042 src/prefs_spelling.c:130
+#: src/gtk/gtkaspell.c:2035 src/prefs_spelling.c:130
 msgid "Check while typing"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2124
+#: src/gtk/gtkaspell.c:2117
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2180
+#: src/gtk/gtkaspell.c:2173
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4512,7 +4546,7 @@ msgid "Configuring..."
 msgstr ""
 
 #: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:636
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2218 src/prefs_summaries.c:701
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:467
 msgid "Date"
 msgstr ""
@@ -4521,9 +4555,9 @@ msgstr ""
 msgid "Date:"
 msgstr ""
 
-#: src/gtk/headers.h:10 src/gtk/quicksearch.c:854
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:857
 #: 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/prefs_summaries.c:703 src/prefs_summary_column.c:81 src/quote_fmt.c:49
 #: src/summaryview.c:465
 msgid "From"
 msgstr ""
@@ -4544,9 +4578,9 @@ msgstr ""
 msgid "Reply-To"
 msgstr ""
 
-#: src/gtk/headers.h:13 src/gtk/quicksearch.c:860
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:863
 #: 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/prefs_summaries.c:704 src/prefs_summary_column.c:82 src/quote_fmt.c:56
 #: src/summaryview.c:466
 msgid "To"
 msgstr ""
@@ -4582,9 +4616,9 @@ msgstr ""
 msgid "References:"
 msgstr ""
 
-#: src/gtk/headers.h:19 src/gtk/quicksearch.c:848
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:851
 #: 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/prefs_summaries.c:705 src/prefs_summary_column.c:80 src/quote_fmt.c:55
 #: src/summaryview.c:464
 msgid "Subject"
 msgstr ""
@@ -4594,7 +4628,7 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:420
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:416
 msgid "Comments"
 msgstr ""
 
@@ -4707,9 +4741,9 @@ msgstr ""
 msgid "Seen:"
 msgstr ""
 
-#: 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/gtk/headers.h:37 src/gtk/progressdialog.c:143
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:709
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1109 src/ssl_manager.c:124
 #: src/summaryview.c:2894
 msgid "Status"
 msgstr ""
@@ -4782,7 +4816,7 @@ msgstr ""
 msgid "Precedence:"
 msgstr ""
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1238
+#: src/gtk/headers.h:46 src/prefs_account.c:1270
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4995,7 +5029,7 @@ msgid "Folder contains marked messages"
 msgstr ""
 
 #: src/gtk/icon_legend.c:91
-msgid "IMAP folder which contains sub-folders only"
+msgid "IMAP folder which contains subfolders only"
 msgstr ""
 
 #: src/gtk/icon_legend.c:92
@@ -5092,11 +5126,10 @@ msgstr ""
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:399
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
-#: src/plugins/fancy/fancy_prefs.c:115
+#: src/plugins/fancy/fancy_prefs.c:105
 #: 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/libravatar/libravatar_prefs.c:567
 #: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:401
@@ -5108,7 +5141,7 @@ msgstr ""
 #: 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/rssyl/rssyl_prefs.c:66
 #: src/plugins/spam_report/spam_report_prefs.c:82
 #: src/plugins/spamassassin/spamassassin_gtk.c:665
 #: src/plugins/vcalendar/vcal_prefs.c:775 src/prefs_toolbar.c:924
@@ -5123,7 +5156,7 @@ msgstr ""
 msgid "_Unload"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:234
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:271
 msgid "Description"
 msgstr ""
 
@@ -5140,30 +5173,30 @@ msgstr ""
 msgid "Unload the selected plugin"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:488
+#: src/gtk/pluginwindow.c:487
 msgid "Loaded plugins"
 msgstr ""
 
 #: 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
+#: src/plugins/archive/archiver_gtk.c:944
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
 msgid "_Apply"
 msgstr ""
 
-#: src/gtk/prefswindow.c:647
+#: src/gtk/prefswindow.c:646
 msgid "Page Index"
 msgstr ""
 
-#: src/gtk/progressdialog.c:89 src/mainwindow.c:850
+#: src/gtk/progressdialog.c:87 src/mainwindow.c:848
 msgid "_Hide"
 msgstr ""
 
-#: 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
+#: src/gtk/progressdialog.c:135 src/plugins/managesieve/sieve_manager.c:694
+#: src/prefs_account.c:4125 src/prefs_account.c:4143 src/prefs_account.c:4161
+#: src/prefs_account.c:4180 src/prefs_account.c:4199 src/prefs_account.c:4217
+#: src/prefs_account.c:4235 src/prefs_account.c:4254 src/prefs_account.c:4337
+#: src/prefs_account.c:4355 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:395 src/prefs_filtering.c:1870
 msgid "Account"
 msgstr ""
 
@@ -5232,15 +5265,15 @@ msgid "forwarded messages"
 msgstr ""
 
 #: src/gtk/quicksearch.c:425
-msgid "messages which have attachments"
+msgid "messages which contain S in any header name or value"
 msgstr ""
 
 #: src/gtk/quicksearch.c:426
-msgid "messages which contain S in any header name or value"
+msgid "messages which contain S in the value of any header"
 msgstr ""
 
 #: src/gtk/quicksearch.c:427
-msgid "messages which contain S in the value of any header"
+msgid "messages which have attachments"
 msgstr ""
 
 #: src/gtk/quicksearch.c:428
@@ -5332,16 +5365,16 @@ msgid "unread messages"
 msgstr ""
 
 #: src/gtk/quicksearch.c:450
-msgid "messages which contain S in References header"
+msgid "messages which contain V in header H"
 msgstr ""
 
 #: src/gtk/quicksearch.c:451
-#, c-format
-msgid "messages returning 0 when passed to command - %F is message file"
+msgid "messages which contain S in References header"
 msgstr ""
 
 #: src/gtk/quicksearch.c:452
-msgid "messages which contain S in X-Label header"
+#, c-format
+msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 
 #: src/gtk/quicksearch.c:454
@@ -5385,65 +5418,65 @@ msgstr ""
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 
-#: src/gtk/quicksearch.c:872
+#: src/gtk/quicksearch.c:875
 msgid "From/To/Cc/Subject/Tag"
 msgstr ""
 
-#: src/gtk/quicksearch.c:890 src/plugins/archive/archiver_prefs.c:415
+#: src/gtk/quicksearch.c:893 src/plugins/archive/archiver_prefs.c:415
 msgid "Recursive"
 msgstr ""
 
-#: src/gtk/quicksearch.c:896
+#: src/gtk/quicksearch.c:899
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/quicksearch.c:902
+#: src/gtk/quicksearch.c:905
 msgid "Type-ahead"
 msgstr ""
 
-#: src/gtk/quicksearch.c:908
+#: src/gtk/quicksearch.c:911
 msgid "Run on select"
 msgstr ""
 
-#: 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/gtk/quicksearch.c:932 src/gtk/quicksearch.c:997
+#: src/gtk/quicksearch.c:1026 src/plugins/libravatar/libravatar_prefs.c:256
+#: src/prefs_actions.c:344 src/prefs_filtering.c:479 src/prefs_template.c:323
 #: src/summary_search.c:317
 msgid "C_lear"
 msgstr ""
 
-#: src/gtk/quicksearch.c:935
+#: src/gtk/quicksearch.c:938
 msgid "Clear the current search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:945 src/summary_search.c:421
+#: src/gtk/quicksearch.c:948 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr ""
 
-#: src/gtk/quicksearch.c:948 src/gtk/quicksearch.c:992
-#: src/gtk/quicksearch.c:1021 src/prefs_actions.c:352
+#: src/gtk/quicksearch.c:951 src/gtk/quicksearch.c:995
+#: src/gtk/quicksearch.c:1024 src/prefs_actions.c:352
 #: src/prefs_filtering_action.c:562 src/prefs_matcher.c:774
-#: src/prefs_summaries.c:496 src/prefs_template.c:332 src/quote_fmt.c:526
-#: src/ssl_manager.c:216
+#: src/prefs_summaries.c:561 src/prefs_template.c:331 src/quote_fmt.c:526
+#: src/ssl_manager.c:214
 msgid "_Information"
 msgstr ""
 
-#: src/gtk/quicksearch.c:954
+#: src/gtk/quicksearch.c:957
 msgid "Information about extended symbols"
 msgstr ""
 
-#: src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
-#: src/gtk/quicksearch.c:1028
+#: src/gtk/quicksearch.c:996 src/gtk/quicksearch.c:1025
+#: src/gtk/quicksearch.c:1031
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:304
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:302
 #, c-format
 msgid "Correct%s"
 msgstr ""
 
 #: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
-#: src/ssl_manager.c:304 src/ssl_manager.c:308
+#: src/ssl_manager.c:302 src/ssl_manager.c:306
 msgid " (expired)"
 msgstr ""
 
@@ -5603,207 +5636,206 @@ msgstr ""
 msgid "Error:"
 msgstr ""
 
-#: src/image_viewer.c:314 src/mimeview.c:2586
-#: src/plugins/att_remover/att_remover.c:306
+#: src/image_viewer.c:314 src/mimeview.c:2611
 #: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr ""
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:326
 msgid "Filesize:"
 msgstr ""
 
-#: src/image_viewer.c:364
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr ""
 
-#: src/imap.c:583
+#: src/imap.c:584
 msgid "IMAP connection broken\n"
 msgstr ""
 
-#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
-#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
-#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
-#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
-#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
-#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
-#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
-#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
-#: src/imap.c:751 src/imap.c:755
+#: src/imap.c:629 src/imap.c:632 src/imap.c:635 src/imap.c:638 src/imap.c:641
+#: src/imap.c:645 src/imap.c:648 src/imap.c:651 src/imap.c:654 src/imap.c:658
+#: src/imap.c:661 src/imap.c:664 src/imap.c:667 src/imap.c:670 src/imap.c:673
+#: src/imap.c:676 src/imap.c:679 src/imap.c:682 src/imap.c:685 src/imap.c:688
+#: src/imap.c:691 src/imap.c:694 src/imap.c:697 src/imap.c:700 src/imap.c:703
+#: src/imap.c:706 src/imap.c:709 src/imap.c:712 src/imap.c:715 src/imap.c:718
+#: src/imap.c:721 src/imap.c:724 src/imap.c:727 src/imap.c:730 src/imap.c:733
+#: src/imap.c:736 src/imap.c:739 src/imap.c:742 src/imap.c:745 src/imap.c:748
+#: src/imap.c:752 src/imap.c:756
 #, c-format
 msgid "IMAP error on %s:"
 msgstr ""
 
-#: src/imap.c:628
+#: src/imap.c:629
 msgid "authenticated"
 msgstr ""
 
-#: src/imap.c:631
+#: src/imap.c:632
 msgid "not authenticated"
 msgstr ""
 
-#: src/imap.c:634
+#: src/imap.c:635
 msgid "bad state"
 msgstr ""
 
-#: src/imap.c:637
+#: src/imap.c:638
 msgid "stream error"
 msgstr ""
 
-#: src/imap.c:640
+#: src/imap.c:641
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:644
+#: src/imap.c:645
 msgid "connection refused"
 msgstr ""
 
-#: src/imap.c:647
+#: src/imap.c:648
 msgid "memory error"
 msgstr ""
 
-#: src/imap.c:650
+#: src/imap.c:651
 msgid "fatal error"
 msgstr ""
 
-#: src/imap.c:653
+#: src/imap.c:654
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:657
+#: src/imap.c:658
 msgid "connection not accepted"
 msgstr ""
 
-#: src/imap.c:660
+#: src/imap.c:661
 msgid "APPEND error"
 msgstr ""
 
-#: src/imap.c:663
+#: src/imap.c:664
 msgid "NOOP error"
 msgstr ""
 
-#: src/imap.c:666
+#: src/imap.c:667
 msgid "LOGOUT error"
 msgstr ""
 
-#: src/imap.c:669
+#: src/imap.c:670
 msgid "CAPABILITY error"
 msgstr ""
 
-#: src/imap.c:672
+#: src/imap.c:673
 msgid "CHECK error"
 msgstr ""
 
-#: src/imap.c:675
+#: src/imap.c:676
 msgid "CLOSE error"
 msgstr ""
 
-#: src/imap.c:678
+#: src/imap.c:679
 msgid "EXPUNGE error"
 msgstr ""
 
-#: src/imap.c:681
+#: src/imap.c:682
 msgid "COPY error"
 msgstr ""
 
-#: src/imap.c:684
+#: src/imap.c:685
 msgid "UID COPY error"
 msgstr ""
 
-#: src/imap.c:687
+#: src/imap.c:688
 msgid "CREATE error"
 msgstr ""
 
-#: src/imap.c:690
+#: src/imap.c:691
 msgid "DELETE error"
 msgstr ""
 
-#: src/imap.c:693
+#: src/imap.c:694
 msgid "EXAMINE error"
 msgstr ""
 
-#: src/imap.c:696
+#: src/imap.c:697
 msgid "FETCH error"
 msgstr ""
 
-#: src/imap.c:699
+#: src/imap.c:700
 msgid "UID FETCH error"
 msgstr ""
 
-#: src/imap.c:702
+#: src/imap.c:703
 msgid "LIST error"
 msgstr ""
 
-#: src/imap.c:705
+#: src/imap.c:706
 msgid "LOGIN error"
 msgstr ""
 
-#: src/imap.c:708
+#: src/imap.c:709
 msgid "LSUB error"
 msgstr ""
 
-#: src/imap.c:711
+#: src/imap.c:712
 msgid "RENAME error"
 msgstr ""
 
-#: src/imap.c:714
+#: src/imap.c:715
 msgid "SEARCH error"
 msgstr ""
 
-#: src/imap.c:717
+#: src/imap.c:718
 msgid "UID SEARCH error"
 msgstr ""
 
-#: src/imap.c:720
+#: src/imap.c:721
 msgid "SELECT error"
 msgstr ""
 
-#: src/imap.c:723
+#: src/imap.c:724
 msgid "STATUS error"
 msgstr ""
 
-#: src/imap.c:726
+#: src/imap.c:727
 msgid "STORE error"
 msgstr ""
 
-#: src/imap.c:729
+#: src/imap.c:730
 msgid "UID STORE error"
 msgstr ""
 
-#: src/imap.c:732
+#: src/imap.c:733
 msgid "SUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:735
+#: src/imap.c:736
 msgid "UNSUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:738
+#: src/imap.c:739
 msgid "STARTTLS error"
 msgstr ""
 
-#: src/imap.c:741
+#: src/imap.c:742
 msgid "INVAL error"
 msgstr ""
 
-#: src/imap.c:744
+#: src/imap.c:745
 msgid "EXTENSION error"
 msgstr ""
 
-#: src/imap.c:747
+#: src/imap.c:748
 msgid "SASL error"
 msgstr ""
 
-#: src/imap.c:751
+#: src/imap.c:752
 msgid "TLS error"
 msgstr ""
 
-#: src/imap.c:755
+#: src/imap.c:756
 #, c-format
 msgid "Unknown error [%d]"
 msgstr ""
 
-#: src/imap.c:968
+#: src/imap.c:1004
 msgid ""
 "\n"
 "\n"
@@ -5811,7 +5843,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:974
+#: src/imap.c:1010
 msgid ""
 "\n"
 "\n"
@@ -5819,7 +5851,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:980
+#: src/imap.c:1016
 msgid ""
 "\n"
 "\n"
@@ -5827,7 +5859,39 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:986
+#: src/imap.c:1022
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-224 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+
+#: src/imap.c:1028
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-256 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+
+#: src/imap.c:1034
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-384 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+
+#: src/imap.c:1040
+msgid ""
+"\n"
+"\n"
+"SCRAM-SHA-512 logins only work if libetpan has been compiled with SASL "
+"support and the SCRAM SASL plugin is installed."
+msgstr ""
+
+#: src/imap.c:1046
 msgid ""
 "\n"
 "\n"
@@ -5835,7 +5899,7 @@ msgid ""
 "the PLAIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:992
+#: src/imap.c:1052
 msgid ""
 "\n"
 "\n"
@@ -5843,43 +5907,43 @@ msgid ""
 "the LOGIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:998
+#: src/imap.c:1058
 msgid ""
 "\n"
 "\n"
 "OAuth2 error. Check and correct your OAuth2 account preferences."
 msgstr ""
 
-#: src/imap.c:1004
+#: src/imap.c:1064
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
-#: src/imap.c:1008
+#: src/imap.c:1068
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
-#: src/imap.c:1026
+#: src/imap.c:1086
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
-#: src/imap.c:1033 src/imap.c:1036
+#: src/imap.c:1093 src/imap.c:1096
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1066 src/imap.c:3743 src/imap.c:4402 src/imap.c:4496
-#: src/imap.c:4674 src/imap.c:5485
+#: src/imap.c:1126 src/imap.c:3804 src/imap.c:4463 src/imap.c:4557
+#: src/imap.c:4737 src/imap.c:5548
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
-#: src/imap.c:1176 src/inc.c:883 src/news.c:402 src/send_message.c:287
+#: src/imap.c:1236 src/inc.c:886 src/news.c:400 src/send_message.c:293
 msgid "Insecure connection"
 msgstr ""
 
-#: src/imap.c:1177 src/inc.c:884 src/news.c:403 src/send_message.c:288
+#: src/imap.c:1237 src/inc.c:887 src/news.c:401 src/send_message.c:294
 msgid ""
 "This connection is configured to be secured using TLS, but TLS is not "
 "available in this build of Claws Mail. \n"
@@ -5888,128 +5952,133 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1183 src/inc.c:890 src/news.c:409 src/send_message.c:294
+#: src/imap.c:1243 src/inc.c:893 src/news.c:407 src/send_message.c:300
 msgid "Con_tinue connecting"
 msgstr ""
 
-#: src/imap.c:1192
+#: src/imap.c:1253
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr ""
 
-#: src/imap.c:1257
+#: src/imap.c:1318
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr ""
 
-#: src/imap.c:1260
+#: src/imap.c:1321
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1292 src/imap.c:4164
+#: src/imap.c:1353 src/imap.c:4225
 msgid "Can't start STARTTLS session.\n"
 msgstr ""
 
-#: src/imap.c:1364
+#: src/imap.c:1425
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr ""
 
-#: src/imap.c:1367
+#: src/imap.c:1428
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
-#: src/imap.c:1795
+#: src/imap.c:1856
 msgid "Adding messages..."
 msgstr ""
 
-#: src/imap.c:2000 src/mh.c:530
+#: src/imap.c:2061 src/mh.c:528
 msgid "Copying messages..."
 msgstr ""
 
-#: src/imap.c:2526
+#: src/imap.c:2587
 msgid "Search failed due to server error."
 msgstr ""
 
-#: src/imap.c:2610
+#: src/imap.c:2671
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2617 src/imap.c:5115
+#: src/imap.c:2678 src/imap.c:5178
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:2992
+#: src/imap.c:3053
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2995
+#: src/imap.c:3056
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3286
+#: src/imap.c:3347
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3299
+#: src/imap.c:3360
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3429
+#: src/imap.c:3490
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3542
+#: src/imap.c:3603
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3821
+#: src/imap.c:3882
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3906
+#: src/imap.c:3967
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:4009
+#: src/imap.c:4070
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4161
+#: src/imap.c:4222
 msgid "Server requires STARTTLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4171
+#: src/imap.c:4232
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4176
+#: src/imap.c:4237
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
 msgstr ""
 
-#: src/imap.c:4184
+#: src/imap.c:4245
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4407
+#: src/imap.c:4468
 msgid "Fetching message..."
 msgstr ""
 
-#: src/imap.c:5108
+#: src/imap.c:4562
+#, fuzzy
+msgid "Expunging deleted messages..."
+msgstr "No labelled messages."
+
+#: src/imap.c:5171
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:6143
+#: src/imap.c:6206
 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"
@@ -6035,7 +6104,7 @@ msgid "Cop_y folder..."
 msgstr ""
 
 #: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
-#: src/plugins/rssyl/rssyl_gtk.c:55
+#: src/plugins/rssyl/rssyl_gtk.c:51
 msgid "_Delete folder..."
 msgstr ""
 
@@ -6055,7 +6124,7 @@ msgstr ""
 msgid "_Subscribe..."
 msgstr ""
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:167
 msgid "_Unsubscribe..."
 msgstr ""
 
@@ -6084,21 +6153,21 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/plugins/mailmbox/plugin_gtk.c:423 src/plugins/rssyl/rssyl_cb_menu.c:229
+#: src/plugins/vcalendar/vcal_folder.c:2091
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
 #: 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
+#: src/plugins/rssyl/rssyl_cb_menu.c:230
+#: src/plugins/vcalendar/vcal_folder.c:2092
 msgid "Rename folder"
 msgstr ""
 
 #: 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
+#: src/plugins/mailmbox/plugin_gtk.c:454 src/plugins/rssyl/rssyl_cb_menu.c:253
+#: src/plugins/vcalendar/vcal_folder.c:2112
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -6115,7 +6184,7 @@ msgid "Select folder to copy folder '%s' to"
 msgstr ""
 
 #: 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
+#: src/plugins/rssyl/rssyl_cb_menu.c:185
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -6125,8 +6194,8 @@ msgid ""
 msgstr ""
 
 #: 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
+#: src/plugins/rssyl/rssyl_cb_menu.c:205
+#: src/plugins/vcalendar/vcal_folder.c:2045
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
@@ -6153,7 +6222,7 @@ msgstr ""
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: src/imap_gtk.c:538 src/mainwindow.c:684
+#: src/imap_gtk.c:538 src/mainwindow.c:683
 msgid "Subscribe"
 msgstr ""
 
@@ -6195,41 +6264,35 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: src/import.c:112 src/import.c:206
+#: src/import.c:115
 msgid "Import mbox file"
 msgstr ""
 
-#: src/import.c:131
+#: src/import.c:135
 msgid "Locate the mbox file and specify the destination folder."
 msgstr ""
 
-#: src/import.c:146
+#: src/import.c:150
 msgid "Destination folder:"
 msgstr ""
 
-#: src/import.c:201
-msgid "Source mbox filename can't be left empty."
-msgstr ""
-
-#: src/import.c:207
-msgid ""
-"Destination folder is not set.\n"
-"Import mbox file to the Inbox folder?"
+#: src/import.c:210
+msgid "Destination folder can't be left empty."
 msgstr ""
 
-#: src/import.c:228
+#: src/import.c:224
 msgid "Can't find the destination folder."
 msgstr ""
 
-#: src/import.c:233
+#: src/import.c:229
 msgid "Importing mbox file..."
 msgstr ""
 
-#: src/import.c:255
+#: src/import.c:251
 msgid "Select importing file"
 msgstr ""
 
-#: src/import.c:273
+#: src/import.c:269
 msgid "Select folder to import to"
 msgstr ""
 
@@ -6374,242 +6437,242 @@ msgstr ""
 msgid "Import Pine file into Address Book"
 msgstr ""
 
-#: src/inc.c:192 src/inc.c:300 src/inc.c:326
+#: src/inc.c:194 src/inc.c:302 src/inc.c:328
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 
-#: src/inc.c:345
+#: src/inc.c:347
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: src/inc.c:477
+#: src/inc.c:479
 msgid "Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:535
+#: src/inc.c:537
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:683 src/inc.c:737
+#: src/inc.c:686 src/inc.c:740
 msgid "Cancelled"
 msgstr ""
 
-#: src/inc.c:694
+#: src/inc.c:697
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:703
+#: src/inc.c:706
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:709
+#: src/inc.c:712
 msgid "Done (no new messages)"
 msgstr ""
 
-#: src/inc.c:714
+#: src/inc.c:717
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:717 src/plugins/managesieve/managesieve.c:890
+#: src/inc.c:720 src/plugins/managesieve/managesieve.c:890
 msgid "Auth failed"
 msgstr ""
 
-#: 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
+#: src/inc.c:727 src/prefs_matcher.c:406 src/prefs_summaries.c:712
+#: src/prefs_summary_column.c:87 src/summaryview.c:2890 src/summaryview.c:6562
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:734
+#: src/inc.c:737
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:820
+#: src/inc.c:823
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:824
+#: src/inc.c:827
 msgid "Finished (no new messages)"
 msgstr ""
 
-#: src/inc.c:867
+#: src/inc.c:870
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:896
+#: src/inc.c:899
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr ""
 
-#: src/inc.c:930
+#: src/inc.c:933
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
-#: src/inc.c:934
+#: src/inc.c:937
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
-#: src/inc.c:1014 src/plugins/managesieve/managesieve.c:426
-#: src/send_message.c:519
+#: src/inc.c:1017 src/plugins/managesieve/managesieve.c:426
+#: src/send_message.c:522
 msgid "Authenticating..."
 msgstr ""
 
-#: src/inc.c:1016
+#: src/inc.c:1019
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr ""
 
-#: src/inc.c:1022
+#: src/inc.c:1025
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
-#: src/inc.c:1026
+#: src/inc.c:1029
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
-#: src/inc.c:1030
+#: src/inc.c:1033
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
-#: src/inc.c:1034
+#: src/inc.c:1037
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:1041 src/send_message.c:537
+#: src/inc.c:1044 src/send_message.c:540
 msgid "Quitting"
 msgstr ""
 
-#: src/inc.c:1066
+#: src/inc.c:1069
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
-#: src/inc.c:1079
+#: src/inc.c:1082
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1234
+#: src/inc.c:1237
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
-#: src/inc.c:1239
+#: src/inc.c:1242
 msgid "Error occurred while processing mail."
 msgstr ""
 
-#: src/inc.c:1245
+#: src/inc.c:1248
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1251
+#: src/inc.c:1254
 msgid "No disk space left."
 msgstr ""
 
-#: src/inc.c:1256
+#: src/inc.c:1259
 msgid "Can't write file."
 msgstr ""
 
-#: src/inc.c:1261
+#: src/inc.c:1264
 msgid "Socket error."
 msgstr ""
 
-#: src/inc.c:1264
+#: src/inc.c:1267
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1269 src/send_message.c:448 src/send_message.c:711
+#: src/inc.c:1272 src/send_message.c:451 src/send_message.c:714
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1272
+#: src/inc.c:1275
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1277
+#: src/inc.c:1280
 msgid "Mailbox is locked."
 msgstr ""
 
-#: src/inc.c:1281
+#: src/inc.c:1284
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1287 src/send_message.c:696
+#: src/inc.c:1290 src/send_message.c:699
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1293 src/send_message.c:699
+#: src/inc.c:1296 src/send_message.c:702
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1298 src/send_message.c:715
+#: src/inc.c:1301 src/send_message.c:718
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
 
-#: src/inc.c:1303
+#: src/inc.c:1306
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1341
+#: src/inc.c:1344
 msgid "Incorporation cancelled\n"
 msgstr ""
 
-#: src/inc.c:1636 src/plugins/notification/notification_prefs.c:1064
+#: src/inc.c:1639 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:553
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1890
+#: src/prefs_other.c:477 src/prefs_receive.c:203 src/prefs_summaries.c:618
 msgid "seconds"
 msgstr ""
 
-#: src/inc.c:1646 src/inc.c:1656
+#: src/inc.c:1649 src/inc.c:1659
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1649
+#: src/inc.c:1652
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1661
+#: src/inc.c:1664
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr ""
 
-#: src/inc.c:1667
+#: src/inc.c:1670
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 
-#: src/inc.c:1674
+#: src/inc.c:1677
 msgid "On_ly once"
 msgstr ""
 
@@ -6646,21 +6709,21 @@ msgstr ""
 msgid "Nick Name"
 msgstr ""
 
-#: src/main.c:253
+#: src/main.c:246
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 
-#: src/main.c:383
+#: src/main.c:376
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 
-#: src/main.c:387
+#: src/main.c:380
 #, c-format
 msgid ""
 "\n"
@@ -6669,38 +6732,38 @@ msgid ""
 "script available at %s."
 msgstr ""
 
-#: src/main.c:400
+#: src/main.c:393
 msgid "Keep old configuration"
 msgstr ""
 
-#: src/main.c:403
+#: src/main.c:396
 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:411
+#: src/main.c:404
 msgid "Migration of configuration"
 msgstr ""
 
-#: src/main.c:422
+#: src/main.c:415
 msgid "Copying configuration... This may take a while..."
 msgstr ""
 
-#: src/main.c:431
+#: src/main.c:424
 msgid "Migration failed!"
 msgstr ""
 
-#: src/main.c:440
+#: src/main.c:433
 msgid "Migrating configuration..."
 msgstr ""
 
-#: src/main.c:1194 src/main.c:1198 src/main.c:1202
+#: src/main.c:1084 src/main.c:1088 src/main.c:1092
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1540
+#: src/main.c:1436
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6713,90 +6776,90 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.c:1582
+#: src/main.c:1478
 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:1588
+#: src/main.c:1484
 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:1828
+#: src/main.c:1731
 msgid "Missing filename\n"
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1738
 msgid "Cannot open filename for reading\n"
 msgstr ""
 
-#: src/main.c:1846
+#: src/main.c:1749
 msgid "Malformed header\n"
 msgstr ""
 
-#: src/main.c:1853
+#: src/main.c:1756
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1864
+#: src/main.c:1767
 msgid "Missing required 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1888
+#: src/main.c:1791
 #, c-format
 msgid "%s. Try -h or --help for usage.\n"
 msgstr ""
 
-#: src/main.c:1917 src/main.c:1980
+#: src/main.c:1820 src/main.c:1883 src/main.c:2058
 #, c-format
 msgid "Missing file argument for option %s"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:1842
 #, c-format
 msgid "Missing or empty uri argument for option %s"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:1845
 #, c-format
 msgid "Missing uri argument for option %s"
 msgstr ""
 
-#: src/main.c:1975
+#: src/main.c:1878
 #, c-format
 msgid "Missing at least one non-empty file argument for option %s"
 msgstr ""
 
-#: src/main.c:2044
+#: src/main.c:1947
 #, c-format
 msgid "Missing folder, type and request arguments for option %s"
 msgstr ""
 
-#: src/main.c:2047
+#: src/main.c:1950
 #, c-format
 msgid "Missing type and request arguments for option %s"
 msgstr ""
 
-#: src/main.c:2050
+#: src/main.c:1953
 #, c-format
 msgid "Missing request argument for option %s"
 msgstr ""
 
-#: src/main.c:2066
+#: src/main.c:1969
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:2068
+#: src/main.c:1971
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:2069
+#: src/main.c:1972
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6807,41 +6870,41 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 
-#: src/main.c:2074
+#: src/main.c:1977
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 
-#: src/main.c:2075
+#: src/main.c:1978
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:2078
+#: src/main.c:1981
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         inserted"
 msgstr ""
 
-#: src/main.c:2081
+#: src/main.c:1984
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:1985
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:2083
+#: src/main.c:1986
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr ""
 
-#: src/main.c:2084
+#: src/main.c:1987
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:1988
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6852,952 +6915,962 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:2092
+#: src/main.c:1995
 msgid "  --send                 send all queued messages"
 msgstr ""
 
-#: src/main.c:2093
+#: src/main.c:1996
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
-#: src/main.c:2094
+#: src/main.c:1997
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
-#: src/main.c:2096
+#: src/main.c:1999
 msgid "  --statistics           show session statistics"
 msgstr ""
 
-#: src/main.c:2097
+#: src/main.c:2000
 msgid "  --reset-statistics     reset session statistics"
 msgstr ""
 
-#: src/main.c:2098
+#: src/main.c:2001
 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:2100
+#: src/main.c:2003
+msgid "  --import-mbox file     import the specified mbox file\n"
+msgstr ""
+
+#: src/main.c:2004
 msgid "  --online               switch to online mode"
 msgstr ""
 
-#: src/main.c:2101
+#: src/main.c:2005
 msgid "  --offline              switch to offline mode"
 msgstr ""
 
-#: src/main.c:2102
+#: src/main.c:2006
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr ""
 
-#: src/main.c:2103
+#: src/main.c:2007
 msgid "  --debug -d             debug mode"
 msgstr ""
 
-#: src/main.c:2104
+#: src/main.c:2008
 msgid "  --toggle-debug         toggle debug mode"
 msgstr ""
 
-#: src/main.c:2105
+#: src/main.c:2009
 msgid "  --help -h              display this help"
 msgstr ""
 
-#: src/main.c:2106
+#: src/main.c:2010
 msgid "  --version -v           output version information"
 msgstr ""
 
-#: src/main.c:2107
+#: src/main.c:2011
 msgid ""
 "  --version-full -V      output version and built-in features information"
 msgstr ""
 
-#: src/main.c:2108
+#: src/main.c:2012
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
-#: src/main.c:2109
+#: src/main.c:2013
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
 
-#: src/main.c:2111
+#: src/main.c:2015
 msgid ""
 "  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
 
-#: src/main.c:2128
+#: src/main.c:2032
 #, c-format
 msgid "Missing directory argument for option %s"
 msgstr ""
 
-#: src/main.c:2136
+#: src/main.c:2040
 #, c-format
 msgid "Missing geometry argument for option %s"
 msgstr ""
 
-#: src/main.c:2147
+#: src/main.c:2051
 #, c-format
 msgid "Missing folder argument for option %s"
 msgstr ""
 
-#: src/main.c:2180 src/main.c:2183
+#: src/main.c:2091 src/main.c:2094
 #, c-format
 msgid "Unknown option %s"
 msgstr ""
 
-#: src/main.c:2199
+#: src/main.c:2110
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
-#: src/main.c:2202
+#: src/main.c:2113
 msgid "top level folder"
 msgstr ""
 
-#: src/main.c:2284
+#: src/main.c:2195
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:2285
+#: src/main.c:2196
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
-#: src/main.c:3052
+#: src/main.c:2925
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:3058
+#: src/main.c:2931
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
-#: src/mainwindow.c:517 src/messageview.c:212
+#: src/mainwindow.c:516 src/messageview.c:212
 msgid "_File"
 msgstr ""
 
-#: src/mainwindow.c:519 src/messageview.c:214 src/summaryview.c:443
+#: src/mainwindow.c:518 src/messageview.c:214 src/summaryview.c:443
 msgid "_View"
 msgstr ""
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:521
 msgid "_Configuration"
 msgstr ""
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:525
 msgid "_Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:526
 msgid "MH..."
 msgstr ""
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:529
 msgid "Change mailbox order..."
 msgstr ""
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:532
 msgid "_Import mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:533
 msgid "_Export to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:534
 msgid "_Export selected to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:537
+#: src/mainwindow.c:536
 msgid "Empty all _Trash folders"
 msgstr "Empty all Was_tebin folders"
 
-#: src/mainwindow.c:540 src/messageview.c:221
+#: src/mainwindow.c:539 src/messageview.c:221
 msgid "_Save email as..."
 msgstr ""
 
-#: src/mainwindow.c:541 src/messageview.c:222
+#: src/mainwindow.c:540 src/messageview.c:222
 msgid "_Save part as..."
 msgstr ""
 
-#: src/mainwindow.c:544 src/messageview.c:223
+#: src/mainwindow.c:543 src/messageview.c:223
 msgid "Page setup..."
 msgstr ""
 
-#: src/mainwindow.c:545 src/messageview.c:224
+#: src/mainwindow.c:544 src/messageview.c:224
 msgid "_Print..."
 msgstr ""
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:546
 msgid "Synchronise folders"
 msgstr ""
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:548
 msgid "E_xit"
 msgstr ""
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:553
 msgid "Select _thread"
 msgstr ""
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:555
 msgid "_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:557
 msgid "_Quick search"
 msgstr ""
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:560
 msgid "Show or hi_de"
 msgstr ""
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:561
 msgid "_Toolbar"
 msgstr ""
 
-#: src/mainwindow.c:564
+#: src/mainwindow.c:563
 msgid "Set displayed _columns"
 msgstr ""
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:564
 msgid "In _folder list..."
 msgstr ""
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:565
 msgid "In _message list..."
 msgstr ""
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:570
 msgid "La_yout"
 msgstr ""
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:572
 msgid "_Sort"
 msgstr ""
 
-#: src/mainwindow.c:575
+#: src/mainwindow.c:574
 msgid "_Attract by subject"
 msgstr ""
 
-#: src/mainwindow.c:577
+#: src/mainwindow.c:576
 msgid "E_xpand all threads"
 msgstr ""
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:577
 msgid "Co_llapse all threads"
 msgstr ""
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:579 src/messageview.c:235
 msgid "_Go to"
 msgstr ""
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:580 src/messageview.c:236
 msgid "_Previous message"
 msgstr ""
 
-#: src/mainwindow.c:582 src/messageview.c:237
+#: src/mainwindow.c:581 src/messageview.c:237
 msgid "_Next message"
 msgstr ""
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:583 src/messageview.c:239
 msgid "P_revious unread message"
 msgstr ""
 
-#: src/mainwindow.c:585 src/messageview.c:240
+#: src/mainwindow.c:584 src/messageview.c:240
 msgid "N_ext unread message"
 msgstr ""
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:586 src/messageview.c:242
 msgid "Previous ne_w message"
 msgstr ""
 
-#: src/mainwindow.c:588 src/messageview.c:243
+#: src/mainwindow.c:587 src/messageview.c:243
 msgid "Ne_xt new message"
 msgstr ""
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:589 src/messageview.c:245
 msgid "Previous _marked message"
 msgstr ""
 
-#: src/mainwindow.c:591 src/messageview.c:246
+#: src/mainwindow.c:590 src/messageview.c:246
 msgid "Next m_arked message"
 msgstr ""
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:592 src/messageview.c:248
 msgid "Previous _labeled message"
 msgstr "Previous _labelled message"
 
-#: src/mainwindow.c:594 src/messageview.c:249
+#: src/mainwindow.c:593 src/messageview.c:249
 msgid "Next la_beled message"
 msgstr "Next la_belled message"
 
-#: src/mainwindow.c:596
+#: src/mainwindow.c:595 src/messageview.c:251
 msgid "Previously opened message"
 msgstr ""
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:596 src/messageview.c:252
 msgid "Next opened message"
 msgstr ""
 
-#: src/mainwindow.c:599 src/messageview.c:254
+#: src/mainwindow.c:598 src/messageview.c:254
 msgid "Parent message"
 msgstr ""
 
-#: src/mainwindow.c:601 src/messageview.c:256
+#: src/mainwindow.c:600 src/messageview.c:256
 msgid "Next unread _folder"
 msgstr ""
 
-#: src/mainwindow.c:602 src/messageview.c:257
+#: src/mainwindow.c:601 src/messageview.c:257
 msgid "F_older..."
 msgstr ""
 
-#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:230
+#: src/mainwindow.c:603 src/messageview.c:259 src/mimeview.c:237
 msgid "Next part"
 msgstr ""
 
-#: src/mainwindow.c:605 src/messageview.c:260 src/mimeview.c:231
+#: src/mainwindow.c:604 src/messageview.c:260 src/mimeview.c:238
 msgid "Previous part"
 msgstr ""
 
-#: src/mainwindow.c:608 src/messageview.c:261
+#: src/mainwindow.c:607 src/messageview.c:261
 msgid "Message scroll"
 msgstr ""
 
-#: src/mainwindow.c:609 src/messageview.c:262
+#: src/mainwindow.c:608 src/messageview.c:262
 msgid "Previous line"
 msgstr ""
 
-#: src/mainwindow.c:610 src/messageview.c:263
+#: src/mainwindow.c:609 src/messageview.c:263
 msgid "Next line"
 msgstr ""
 
-#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:478
+#: src/mainwindow.c:610 src/messageview.c:264 src/printing.c:481
 msgid "Previous page"
 msgstr ""
 
-#: src/mainwindow.c:612 src/messageview.c:265 src/printing.c:484
+#: src/mainwindow.c:611 src/messageview.c:265 src/printing.c:487
 msgid "Next page"
 msgstr ""
 
-#: src/mainwindow.c:630 src/messageview.c:283
+#: src/mainwindow.c:629 src/messageview.c:283
 msgid "Decode"
 msgstr ""
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:636
 msgid "Open in new _window"
 msgstr ""
 
-#: src/mainwindow.c:638 src/messageview.c:290
+#: src/mainwindow.c:637 src/messageview.c:290
 msgid "Mess_age source"
 msgstr ""
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:639 src/messageview.c:291
 msgid "Message part"
 msgstr ""
 
-#: src/mainwindow.c:641 src/messageview.c:292
+#: src/mainwindow.c:640 src/messageview.c:292
 msgid "View as text"
 msgstr ""
 
-#: src/mainwindow.c:642 src/messageview.c:293 src/toolbar.c:504
+#: src/mainwindow.c:641 src/messageview.c:293 src/toolbar.c:503
 msgid "Open"
 msgstr ""
 
-#: src/mainwindow.c:644 src/messageview.c:295
+#: src/mainwindow.c:643 src/messageview.c:295
 msgid "Open with..."
 msgstr ""
 
-#: src/mainwindow.c:648 src/messageview.c:298
+#: src/mainwindow.c:647 src/messageview.c:298
 msgid "Quotes"
 msgstr ""
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:649
 msgid "_Update summary"
 msgstr ""
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:652
 msgid "Recei_ve"
 msgstr ""
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:653
 msgid "Get from _current account"
 msgstr ""
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:654
 msgid "Get from _all accounts"
 msgstr ""
 
-#: src/mainwindow.c:656
+#: src/mainwindow.c:655
 msgid "Cancel receivin_g"
 msgstr ""
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:658
 msgid "_Send queued messages"
 msgstr ""
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:663
 msgid "Compose a_n email message"
 msgstr ""
 
-#: src/mainwindow.c:665
+#: src/mainwindow.c:664
 msgid "Compose a news message"
 msgstr ""
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:666 src/messageview.c:304
 #: src/plugins/notification/notification_banner.c:96 src/summaryview.c:427
 msgid "_Reply"
 msgstr ""
 
-#: src/mainwindow.c:668 src/messageview.c:305 src/summaryview.c:428
+#: src/mainwindow.c:667 src/messageview.c:305 src/summaryview.c:428
 msgid "Repl_y to"
 msgstr ""
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/summaryview.c:431
+#: src/mainwindow.c:670 src/messageview.c:308 src/summaryview.c:431
 msgid "Mailing _list"
 msgstr ""
 
-#: src/mainwindow.c:672
+#: src/mainwindow.c:671
 msgid "Follow-up and reply to"
 msgstr ""
 
-#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
-#: src/toolbar.c:2491
+#: src/mainwindow.c:674 src/messageview.c:311 src/summaryview.c:433
+#: src/toolbar.c:2490
 msgid "_Forward"
 msgstr ""
 
-#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
-#: src/toolbar.c:2492
+#: src/mainwindow.c:675 src/messageview.c:312 src/summaryview.c:434
+#: src/toolbar.c:2491
 msgid "For_ward as attachment"
 msgstr ""
 
-#: src/mainwindow.c:677 src/messageview.c:313 src/summaryview.c:435
-#: src/toolbar.c:2493
+#: src/mainwindow.c:676 src/messageview.c:313 src/summaryview.c:435
+#: src/toolbar.c:2492
 msgid "Redirec_t"
 msgstr ""
 
-#: src/mainwindow.c:679
+#: src/mainwindow.c:678
 msgid "Mailing-_List"
 msgstr ""
 
-#: src/mainwindow.c:680
+#: src/mainwindow.c:679
 msgid "Post"
 msgstr ""
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:681
 msgid "Help"
 msgstr ""
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:685
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:687
 msgid "View archive"
 msgstr ""
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:689
 msgid "Contact owner"
 msgstr ""
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:693
 msgid "M_ove..."
 msgstr ""
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:694
 msgid "_Copy..."
 msgstr ""
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:695
 msgid "Move to _trash"
 msgstr "Move to was_tebin"
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:696
 msgid "_Delete..."
 msgstr ""
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:697
 msgid "Move thread to tr_ash"
 msgstr "Move thread to was_tebin"
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:698
 msgid "Delete t_hread"
 msgstr ""
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:699
 msgid "Cancel a news message"
 msgstr ""
 
-#: src/mainwindow.c:703 src/mainwindow.c:704 src/summaryview.c:436
+#: src/mainwindow.c:701 src/summaryview.c:436
+msgctxt "Menu Item"
 msgid "_Mark"
 msgstr ""
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:702
+msgctxt "Sub-Menu Item"
+msgid "_Mark"
+msgstr ""
+
+#: src/mainwindow.c:703
 msgid "_Unmark"
 msgstr ""
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:706
 msgid "Mark as rea_d"
 msgstr ""
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:707
 msgid "Mark as unr_ead"
 msgstr ""
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:709
 msgid "Mark all read in folder"
 msgstr ""
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:710
 msgid "Mark all unread in folder"
 msgstr ""
 
-#: src/mainwindow.c:714 src/prefs_filtering_action.c:191 src/toolbar.c:245
-#: src/toolbar.c:513
+#: src/mainwindow.c:712 src/prefs_filtering_action.c:191 src/toolbar.c:244
+#: src/toolbar.c:512
 msgid "Ignore thread"
 msgstr ""
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:713
 msgid "Unignore thread"
 msgstr ""
 
-#: src/mainwindow.c:716 src/prefs_filtering_action.c:192 src/toolbar.c:246
-#: src/toolbar.c:514
+#: src/mainwindow.c:714 src/prefs_filtering_action.c:192 src/toolbar.c:245
+#: src/toolbar.c:513
 msgid "Watch thread"
 msgstr ""
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:715
 msgid "Unwatch thread"
 msgstr ""
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:718
 msgid "Mark as _spam"
 msgstr ""
 
-#: src/mainwindow.c:721
+#: src/mainwindow.c:719
 msgid "Mark as _ham"
 msgstr ""
 
-#: src/mainwindow.c:724 src/prefs_filtering_action.c:175 src/toolbar.c:517
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:175 src/toolbar.c:516
 msgid "Lock"
 msgstr ""
 
-#: src/mainwindow.c:725 src/prefs_filtering_action.c:176 src/toolbar.c:518
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:176 src/toolbar.c:517
 msgid "Unlock"
 msgstr ""
 
-#: src/mainwindow.c:727 src/summaryview.c:437
+#: src/mainwindow.c:725 src/summaryview.c:437
 msgid "Color la_bel"
 msgstr "Colour la_bel"
 
-#: src/mainwindow.c:728 src/summaryview.c:438
+#: src/mainwindow.c:726 src/summaryview.c:438
 msgid "Ta_gs"
 msgstr ""
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:729
 msgid "Re-_edit"
 msgstr ""
 
-#: src/mainwindow.c:734 src/messageview.c:314 src/mimeview.c:1052
+#: src/mainwindow.c:732 src/messageview.c:314 src/mimeview.c:1060
 msgid "Check signature"
 msgstr ""
 
-#: src/mainwindow.c:739 src/messageview.c:318
+#: src/mainwindow.c:737 src/messageview.c:318
 msgid "Add sender to address boo_k"
 msgstr ""
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:739
 msgid "C_ollect addresses"
 msgstr ""
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:740
 msgid "From current _folder..."
 msgstr ""
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:741
 msgid "From selected _messages..."
 msgstr ""
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:744
 msgid "_Filter all messages in folder"
 msgstr ""
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:745
 msgid "Filter _selected messages"
 msgstr ""
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:746
 msgid "Run folder pr_ocessing rules"
 msgstr ""
 
-#: src/mainwindow.c:750 src/messageview.c:321
+#: src/mainwindow.c:748 src/messageview.c:321
 msgid "_Create filter rule"
 msgstr ""
 
-#: src/mainwindow.c:751 src/mainwindow.c:758 src/messageview.c:322
+#: src/mainwindow.c:749 src/mainwindow.c:756 src/messageview.c:322
 #: src/messageview.c:329
 msgid "_Automatically"
 msgstr ""
 
-#: src/mainwindow.c:752 src/mainwindow.c:759 src/mainwindow.c:867
+#: src/mainwindow.c:750 src/mainwindow.c:757 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:330
 msgid "By _From"
 msgstr ""
 
-#: src/mainwindow.c:753 src/mainwindow.c:760 src/mainwindow.c:868
+#: src/mainwindow.c:751 src/mainwindow.c:758 src/mainwindow.c:866
 #: src/messageview.c:324 src/messageview.c:331
 msgid "By _To"
 msgstr ""
 
-#: src/mainwindow.c:754 src/mainwindow.c:761 src/messageview.c:325
+#: src/mainwindow.c:752 src/mainwindow.c:759 src/messageview.c:325
 #: src/messageview.c:332
 msgid "By _Subject"
 msgstr ""
 
-#: src/mainwindow.c:755 src/mainwindow.c:762 src/messageview.c:326
+#: src/mainwindow.c:753 src/mainwindow.c:760 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
+#: src/mainwindow.c:755 src/messageview.c:328 src/summaryview.c:441
 msgid "Create processing rule"
 msgstr ""
 
-#: src/mainwindow.c:765 src/messageview.c:336
+#: src/mainwindow.c:763 src/messageview.c:336
 msgid "List _URLs..."
 msgstr ""
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:770
 msgid "Ch_eck for new messages in all folders"
 msgstr ""
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:771
 msgid "Delete du_plicated messages"
 msgstr ""
 
-#: src/mainwindow.c:774
+#: src/mainwindow.c:772
 msgid "In selected folder"
 msgstr ""
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:773
 msgid "In all folders"
 msgstr ""
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:776
 msgid "E_xecute"
 msgstr ""
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:777
 msgid "Exp_unge"
 msgstr ""
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:780
 msgid "TLS cer_tificates"
 msgstr ""
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:783
 msgid "Filtering Lo_g"
 msgstr ""
 
-#: src/mainwindow.c:786
+#: src/mainwindow.c:784
 msgid "Network _Log"
 msgstr ""
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:786
 msgid "Debug _Log"
 msgstr ""
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:789
 msgid "_Forget all session passwords"
 msgstr ""
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:791
 msgid "Forget _primary passphrase"
 msgstr ""
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:795
 msgid "C_hange current account"
 msgstr ""
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:797
 msgid "_Preferences for current account..."
 msgstr ""
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:798
 msgid "Create _new account..."
 msgstr ""
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:799
 msgid "_Edit accounts..."
 msgstr ""
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:802
 msgid "P_references..."
 msgstr ""
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:803
 msgid "Pre-pr_ocessing..."
 msgstr ""
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:804
 msgid "Post-pro_cessing..."
 msgstr ""
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:805
 msgid "_Filtering..."
 msgstr ""
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:806
 msgid "_Templates..."
 msgstr ""
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:807
 msgid "_Actions..."
 msgstr ""
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:808
 msgid "Tag_s..."
 msgstr ""
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:810
 msgid "Plu_gins..."
 msgstr ""
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:813
 msgid "_Manual"
 msgstr ""
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:814
 msgid "_Online User-contributed FAQ"
 msgstr ""
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:815
 msgid "Icon _Legend"
 msgstr ""
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:817
 msgid "Set as default client"
 msgstr ""
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:824
 msgid "Offline _mode"
 msgstr ""
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:825
 msgid "Men_ubar"
 msgstr ""
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:826
 msgid "_Message view"
 msgstr ""
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:828
 msgid "Status _bar"
 msgstr ""
 
-#: src/mainwindow.c:832
+#: src/mainwindow.c:830
 msgid "Column headers"
 msgstr ""
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:831
 msgid "Th_read view"
 msgstr ""
 
-#: src/mainwindow.c:834 src/prefs_summaries.c:669
+#: src/mainwindow.c:832 src/prefs_summaries.c:734
 msgid "Hide read threads"
 msgstr ""
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:833
 msgid "_Hide read messages"
 msgstr ""
 
-#: src/mainwindow.c:836 src/prefs_summaries.c:675
+#: src/mainwindow.c:834 src/prefs_summaries.c:740
 msgid "Hide deleted messages"
 msgstr ""
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:835
 msgid "_Fullscreen"
 msgstr ""
 
-#: src/mainwindow.c:838 src/messageview.c:348
+#: src/mainwindow.c:836 src/messageview.c:348
 msgid "Show all _headers"
 msgstr ""
 
-#: src/mainwindow.c:839 src/messageview.c:349
+#: src/mainwindow.c:837 src/messageview.c:349
 msgid "_Collapse all"
 msgstr ""
 
-#: src/mainwindow.c:840 src/messageview.c:350
+#: src/mainwindow.c:838 src/messageview.c:350
 msgid "Collapse from level _2"
 msgstr ""
 
-#: src/mainwindow.c:841 src/messageview.c:351
+#: src/mainwindow.c:839 src/messageview.c:351
 msgid "Collapse from level _3"
 msgstr ""
 
-#: src/mainwindow.c:845
+#: src/mainwindow.c:843
 msgid "Text _below icons"
 msgstr ""
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:844
 msgid "Text be_side icons"
 msgstr ""
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:845
 msgid "_Icons only"
 msgstr ""
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:846
 msgid "_Text only"
 msgstr ""
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:853
 msgid "_Standard"
 msgstr ""
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:854
 msgid "_Three columns"
 msgstr ""
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:855
 msgid "_Wide message"
 msgstr ""
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:856
 msgid "W_ide message list"
 msgstr ""
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:857
 msgid "S_mall screen"
 msgstr ""
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:861
 msgid "By _number"
 msgstr ""
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:862
 msgid "By s_ize"
 msgstr ""
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:863
 msgid "By _date"
 msgstr ""
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:864
 msgid "By thread date"
 msgstr ""
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:867
 msgid "By s_ubject"
 msgstr ""
 
-#: src/mainwindow.c:870
+#: src/mainwindow.c:868
 msgid "By _color label"
 msgstr "By _colour label"
 
-#: src/mainwindow.c:871
+#: src/mainwindow.c:869
 msgid "By tag"
 msgstr ""
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:870
 msgid "By _mark"
 msgstr ""
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:871
 msgid "By _status"
 msgstr ""
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:872
 msgid "By a_ttachment"
 msgstr ""
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:873
 msgid "By score"
 msgstr ""
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:874
 msgid "By locked"
 msgstr ""
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:875
 msgid "D_on't sort"
 msgstr ""
 
-#: src/mainwindow.c:881 src/prefs_summaries.c:656
+#: src/mainwindow.c:879 src/prefs_summaries.c:721
 msgid "Ascending"
 msgstr ""
 
-#: src/mainwindow.c:882 src/prefs_summaries.c:657
+#: src/mainwindow.c:880 src/prefs_summaries.c:722
 msgid "Descending"
 msgstr ""
 
-#: src/mainwindow.c:924 src/messageview.c:393
+#: src/mainwindow.c:922 src/messageview.c:393
 msgid "_Auto detect"
 msgstr ""
 
-#: src/mainwindow.c:1299 src/summaryview.c:6489
+#: src/mainwindow.c:1297 src/summaryview.c:6490
 msgid "Modify tags..."
 msgstr ""
 
-#: src/mainwindow.c:1924
+#: src/mainwindow.c:1922
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
-#: src/mainwindow.c:1955
+#: src/mainwindow.c:1953
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1956
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
-#: src/mainwindow.c:1972
+#: src/mainwindow.c:1970
 msgid "Select account"
 msgstr ""
 
-#: src/mainwindow.c:1999 src/prefs_logging.c:136
+#: src/mainwindow.c:1997 src/prefs_logging.c:136
 msgid "Network log"
 msgstr ""
 
-#: src/mainwindow.c:2003
+#: src/mainwindow.c:2001
 msgid "Filtering/Processing debug log"
 msgstr ""
 
-#: src/mainwindow.c:2022 src/prefs_logging.c:378
+#: src/mainwindow.c:2020 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2024 src/prefs_logging.c:380
+#: src/mainwindow.c:2022 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr ""
 
-#: 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/mainwindow.c:2451 src/mainwindow.c:2458 src/mainwindow.c:2501
+#: src/mainwindow.c:2534 src/mainwindow.c:2566 src/mainwindow.c:2611
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1136
+#: src/plugins/rssyl/opml_import.c:69 src/prefs_folder_item.c:1136
 msgid "Untitled"
 msgstr ""
 
-#: src/mainwindow.c:2614 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2612 src/prefs_summary_open.c:113
 msgid "none"
 msgstr ""
 
-#: src/mainwindow.c:2871 src/mainwindow.c:2876
+#: src/mainwindow.c:2863 src/mainwindow.c:2868
 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 
-#: src/mainwindow.c:2872
+#: src/mainwindow.c:2864
 msgid "Don't quit"
 msgstr ""
 
-#: src/mainwindow.c:2903 src/plugins/mailmbox/plugin_gtk.c:190
+#: src/mainwindow.c:2895 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2896
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7806,185 +7879,185 @@ msgid ""
 "scanned automatically."
 msgstr ""
 
-#: src/mainwindow.c:2912 src/plugins/mailmbox/plugin_gtk.c:197
-#: src/plugins/rssyl/rssyl_gtk.c:132
+#: src/mainwindow.c:2904 src/plugins/mailmbox/plugin_gtk.c:197
+#: src/plugins/rssyl/rssyl_gtk.c:128
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 
-#: src/mainwindow.c:2917 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
+#: src/mainwindow.c:2909 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:51
 #: src/wizard.c:741
 msgid "Mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2922 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
+#: src/mainwindow.c:2914 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:54
 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:3389
+#: src/mainwindow.c:3383
 msgid "No posting allowed"
 msgstr ""
 
-#: src/mainwindow.c:3949
+#: src/mainwindow.c:3942 src/mainwindow.c:5587
 msgid "Mbox import has failed."
 msgstr ""
 
-#: src/mainwindow.c:3958 src/mainwindow.c:3967
+#: src/mainwindow.c:3951 src/mainwindow.c:3960
 msgid "Export to mbox has failed."
 msgstr ""
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4001 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr ""
 
-#: src/mainwindow.c:4008 src/plugins/notification/notification_trayicon.c:549
+#: src/mainwindow.c:4001 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr ""
 
-#: src/mainwindow.c:4009
+#: src/mainwindow.c:4002
 msgid "_Quit"
 msgstr ""
 
-#: src/mainwindow.c:4210
+#: src/mainwindow.c:4203
 msgid "Folder synchronisation"
 msgstr ""
 
-#: src/mainwindow.c:4211
+#: src/mainwindow.c:4204
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
-#: src/mainwindow.c:4212
+#: src/mainwindow.c:4205
 msgid "_Synchronise"
 msgstr ""
 
-#: src/mainwindow.c:4695
+#: src/mainwindow.c:4688
 msgid "Deleting duplicated messages..."
 msgstr ""
 
-#: src/mainwindow.c:4705
+#: src/mainwindow.c:4698
 msgid "No duplicate message found in selected folder.\n"
 msgstr ""
 
-#: src/mainwindow.c:4711
+#: src/mainwindow.c:4704
 #, 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:4715
+#: src/mainwindow.c:4708
 #, 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:4753
+#: src/mainwindow.c:4746
 msgid "Deleting duplicated messages in all folders..."
 msgstr ""
 
-#: src/mainwindow.c:4759
+#: src/mainwindow.c:4752
 #, 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:4764
+#: src/mainwindow.c:4757
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr ""
 
-#: src/mainwindow.c:4926 src/messageview.c:2647
+#: src/mainwindow.c:4919 src/messageview.c:2647
 msgid "Select folder to go to"
 msgstr ""
 
-#: src/mainwindow.c:5029 src/summaryview.c:5932
+#: src/mainwindow.c:5022 src/summaryview.c:5933
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5037
+#: src/mainwindow.c:5030
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5045 src/summaryview.c:5943
+#: src/mainwindow.c:5038 src/summaryview.c:5944
 msgid "Filtering configuration"
 msgstr ""
 
-#: src/mainwindow.c:5158
+#: src/mainwindow.c:5151
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 
-#: src/mainwindow.c:5249
+#: src/mainwindow.c:5242
 msgid "Claws Mail has been registered as default client."
 msgstr ""
 
-#: src/mainwindow.c:5251
+#: src/mainwindow.c:5244
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 
-#: src/mainwindow.c:5265 src/setup.c:91
+#: src/mainwindow.c:5258 src/setup.c:75
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr ""
 
-#: src/mainwindow.c:5409
+#: src/mainwindow.c:5402
 #, 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: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
+#: src/matcher.c:215 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
 #, c-format
 msgid "%s header"
 msgstr ""
 
-#: src/matcher.c:224
+#: src/matcher.c:223
 msgid "header"
 msgstr ""
 
-#: src/matcher.c:225
+#: src/matcher.c:224
 msgid "header line"
 msgstr ""
 
-#: src/matcher.c:226
+#: src/matcher.c:225
 msgid "body line"
 msgstr ""
 
-#: src/matcher.c:227
+#: src/matcher.c:226
 msgid "tag"
 msgstr ""
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:527 src/matcher.c:532 src/matcher.c:551 src/matcher.c:556
 #: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr ""
 
-#: src/matcher.c:537 src/matcher.c:542 src/matcher.c:561 src/matcher.c:566
+#: src/matcher.c:527 src/matcher.c:532 src/matcher.c:551 src/matcher.c:556
 msgid "Case insensitive"
 msgstr ""
 
-#: src/matcher.c:1902
+#: src/matcher.c:1892
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr ""
 
-#: src/matcher.c:1975 src/matcher.c:1994 src/matcher.c:2007
+#: src/matcher.c:1965 src/matcher.c:1984 src/matcher.c:1997
 msgid "message matches\n"
 msgstr ""
 
-#: src/matcher.c:1982 src/matcher.c:2000 src/matcher.c:2009
+#: src/matcher.c:1972 src/matcher.c:1990 src/matcher.c:1999
 msgid "message does not match\n"
 msgstr ""
 
-#: 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
+#: src/matcher.c:2264 src/matcher.c:2265 src/matcher.c:2266 src/matcher.c:2267
+#: src/matcher.c:2268 src/matcher.c:2269 src/matcher.c:2270 src/matcher.c:2271
 msgid "(none)"
 msgstr ""
 
@@ -8017,7 +8090,7 @@ msgstr ""
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/mbox.c:549 src/mimeview.c:1818 src/prefs_themes.c:600
+#: src/mbox.c:549 src/mimeview.c:1826 src/prefs_themes.c:577
 msgid "Overwrite"
 msgstr ""
 
@@ -8060,10 +8133,6 @@ msgstr ""
 msgid "Search finished"
 msgstr ""
 
-#: src/messageview.c:251
-msgid "Previous opened message"
-msgstr ""
-
 #: src/messageview.c:301 src/textview.c:248
 msgid "Compose _new message"
 msgstr ""
@@ -8095,7 +8164,7 @@ msgstr ""
 msgid "Fetching message (%s)..."
 msgstr ""
 
-#: src/messageview.c:1408 src/procmime.c:1026
+#: src/messageview.c:1408 src/procmime.c:984
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
@@ -8160,7 +8229,7 @@ msgid ""
 msgstr ""
 
 #: src/messageview.c:1988 src/messageview.c:2001
-#: src/prefs_filtering_action.c:174 src/toolbar.c:516
+#: src/prefs_filtering_action.c:174 src/toolbar.c:515
 msgid "Unmark"
 msgstr ""
 
@@ -8219,16 +8288,16 @@ msgid ""
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4404
-#: src/summaryview.c:7290
+#: src/messageview.c:2999 src/messageview.c:3005 src/summaryview.c:4405
+#: src/summaryview.c:7295
 msgid "An error happened while learning.\n"
 msgstr ""
 
-#: src/mh.c:528
+#: src/mh.c:526
 msgid "Moving messages..."
 msgstr ""
 
-#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:836
+#: src/mh.c:670 src/plugins/mailmbox/mailmbox_folder.c:833
 msgid "Deleting messages..."
 msgstr ""
 
@@ -8255,163 +8324,167 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr ""
 
-#: src/mimeview.c:221 src/prefs_actions.c:1315
+#: src/mimeview.c:227 src/prefs_actions.c:1314
 msgid "_Open"
 msgstr ""
 
-#: src/mimeview.c:223
+#: src/mimeview.c:229
 msgid "Open _with..."
 msgstr ""
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:170
+#: src/mimeview.c:231 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr ""
 
-#: src/mimeview.c:226
+#: src/mimeview.c:232
 msgid "Send to..."
 msgstr ""
 
-#: src/mimeview.c:227
+#: src/mimeview.c:233
 msgid "_Display as text"
 msgstr ""
 
-#: src/mimeview.c:228
+#: src/mimeview.c:234
 msgid "_Save as..."
 msgstr ""
 
-#: src/mimeview.c:229
+#: src/mimeview.c:235
 msgid "Save _all..."
 msgstr ""
 
-#: src/mimeview.c:302
+#: src/mimeview.c:236
+msgid "Save all attachments..."
+msgstr ""
+
+#: src/mimeview.c:309
 msgid "MIME Type"
 msgstr ""
 
-#: src/mimeview.c:1057 src/mimeview.c:1062 src/mimeview.c:1067
-#: src/mimeview.c:1072
+#: src/mimeview.c:1065 src/mimeview.c:1070 src/mimeview.c:1075
+#: src/mimeview.c:1080
 msgid "View full information"
 msgstr ""
 
-#: src/mimeview.c:1079
+#: src/mimeview.c:1087
 msgid "Check again"
 msgstr ""
 
-#: src/mimeview.c:1092
+#: src/mimeview.c:1100
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr ""
 
-#: src/mimeview.c:1094
+#: src/mimeview.c:1102
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr ""
 
-#: src/mimeview.c:1101
+#: src/mimeview.c:1109
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 
-#: src/mimeview.c:1103
+#: src/mimeview.c:1111
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 
-#: src/mimeview.c:1110
+#: src/mimeview.c:1118
 msgid "Error checking the signature. Click the icon to try again."
 msgstr ""
 
-#: src/mimeview.c:1112
+#: src/mimeview.c:1120
 #, c-format
 msgid "Error checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 
-#: src/mimeview.c:1231
+#: src/mimeview.c:1239
 msgid "Checking signature..."
 msgstr ""
 
-#: src/mimeview.c:1286
+#: src/mimeview.c:1294
 msgid "Go back to email"
 msgstr ""
 
-#: 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
+#: src/mimeview.c:1744 src/mimeview.c:1837 src/mimeview.c:2094
+#: src/mimeview.c:2130 src/mimeview.c:2242 src/plugins/fancy/fancy_viewer.c:512
+#: src/plugins/fancy/fancy_viewer.c:541
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 
-#: src/mimeview.c:1815
+#: src/mimeview.c:1823
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr ""
 
-#: src/mimeview.c:1839
+#: src/mimeview.c:1848
 #, c-format
 msgid ""
-"An error has occurred while saving message part #%d. Do you want to cancel "
-"operation or skip error and continue?"
+"An error has occurred while saving message part %d. Do you want to cancel "
+"saving or ignore error and continue?"
 msgstr ""
 
-#: src/mimeview.c:1842
-msgid "Error saving all message parts"
+#: src/mimeview.c:1851
+msgid "Error saving message part"
 msgstr ""
 
-#: src/mimeview.c:1843
-msgid "Skip"
+#: src/mimeview.c:1852
+msgid "Ignore"
 msgstr ""
 
-#: src/mimeview.c:1843
-msgid "Skip all"
+#: src/mimeview.c:1852
+msgid "Ignore all"
 msgstr ""
 
-#: src/mimeview.c:1853
+#: src/mimeview.c:1864
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1861
+#: src/mimeview.c:1876
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1866
+#: src/mimeview.c:1881
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1899 src/plugins/archive/archiver_prefs.c:141
+#: src/mimeview.c:1918 src/plugins/archive/archiver_prefs.c:141
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr ""
 
-#: src/mimeview.c:1906 src/plugins/archive/archiver_prefs.c:147
+#: src/mimeview.c:1925 src/plugins/archive/archiver_prefs.c:147
 #, c-format
 msgid "'%s' is not a directory."
 msgstr ""
 
-#: src/mimeview.c:2023 src/plugins/fancy/fancy_viewer.c:812
-#: src/summaryview.c:5017
+#: src/mimeview.c:2047 src/plugins/fancy/fancy_viewer.c:815
+#: src/summaryview.c:5018
 msgid "Save as"
 msgstr ""
 
-#: src/mimeview.c:2153 src/mimeview.c:2160
+#: src/mimeview.c:2177 src/mimeview.c:2184
 msgid "Open with"
 msgstr ""
 
-#: src/mimeview.c:2154 src/mimeview.c:2161
+#: src/mimeview.c:2178 src/mimeview.c:2185
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 
-#: src/mimeview.c:2256
+#: src/mimeview.c:2281
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8419,11 +8492,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/mimeview.c:2264
+#: src/mimeview.c:2289
 msgid "Execute untrusted binary?"
 msgstr ""
 
-#: src/mimeview.c:2265
+#: src/mimeview.c:2290
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8431,96 +8504,96 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 
-#: src/mimeview.c:2269
+#: src/mimeview.c:2294
 msgid "Run binary"
 msgstr ""
 
-#: src/mimeview.c:2571 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2596
 msgid "Type:"
 msgstr ""
 
-#: src/mimeview.c:2572 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2784
+#: src/mimeview.c:2597 src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/summaryview.c:2784
 msgid "Size:"
 msgstr ""
 
-#: src/mimeview.c:2586 src/plugins/vcalendar/vcalendar.c:1244
+#: src/mimeview.c:2611 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 ""
 
-#: src/news.c:300
+#: src/news.c:298
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr ""
 
-#: src/news.c:335
+#: src/news.c:333
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr ""
 
-#: src/news.c:372
+#: src/news.c:370
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:451
+#: src/news.c:449
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 
-#: src/news.c:460
+#: src/news.c:458
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr ""
 
-#: src/news.c:464
+#: src/news.c:462
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr ""
 
-#: src/news.c:479
+#: src/news.c:477
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:504
+#: src/news.c:502
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 
-#: src/news.c:875
+#: src/news.c:873
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr ""
 
-#: src/news.c:1068 src/news.c:1254
+#: src/news.c:1066 src/news.c:1252
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr ""
 
-#: src/news.c:1077
+#: src/news.c:1075
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 
-#: src/news.c:1155 src/news.c:1182 src/news.c:1209
+#: src/news.c:1153 src/news.c:1180 src/news.c:1207
 msgid "couldn't get xhdr\n"
 msgstr ""
 
-#: src/news.c:1247
+#: src/news.c:1245
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
-#: src/news.c:1262
+#: src/news.c:1260
 msgid "couldn't get xover\n"
 msgstr ""
 
-#: src/news.c:1279
+#: src/news.c:1277
 msgid "invalid xover line\n"
 msgstr ""
 
-#: src/news.c:1481
+#: src/news.c:1479
 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"
@@ -8549,88 +8622,88 @@ msgstr ""
 msgid "Rename newsgroup folder"
 msgstr ""
 
-#: src/oauth2.c:239
+#: src/oauth2.c:250
+msgid "OAuth2 socket write error\n"
+msgstr ""
+
+#: src/oauth2.c:276
+msgid "OAuth2 socket timeout error\n"
+msgstr ""
+
+#: src/oauth2.c:307
 msgid "OAuth2 missing authorization code\n"
 msgstr "OAuth2 missing authorisation code\n"
 
-#: src/oauth2.c:245 src/oauth2.c:398
+#: src/oauth2.c:313 src/oauth2.c:455
 msgid "OAuth2 connection error\n"
 msgstr ""
 
-#: src/oauth2.c:255 src/oauth2.c:407
+#: src/oauth2.c:325 src/oauth2.c:466
 msgid "OAuth2 TLS connection error\n"
 msgstr ""
 
-#: src/oauth2.c:346 src/oauth2.c:480
+#: src/oauth2.c:403 src/oauth2.c:541
 msgid "OAuth2 access token obtained\n"
 msgstr ""
 
-#: src/oauth2.c:348 src/oauth2.c:482 src/oauth2.c:658
+#: src/oauth2.c:405 src/oauth2.c:543 src/oauth2.c:676
 msgid "OAuth2 access token not obtained\n"
 msgstr ""
 
-#: src/oauth2.c:355
+#: src/oauth2.c:412
 msgid "OAuth2 refresh token obtained\n"
 msgstr ""
 
-#: src/oauth2.c:357
+#: src/oauth2.c:414
 msgid "OAuth2 refresh token not obtained\n"
 msgstr ""
 
-#: src/oauth2.c:489
+#: src/oauth2.c:550
 msgid "OAuth2 replacement refresh token provided\n"
 msgstr ""
 
-#: src/oauth2.c:491
+#: src/oauth2.c:552
 msgid "OAuth2 replacement refresh token not provided\n"
 msgstr ""
 
-#: src/oauth2.c:522
-msgid "OAuth2 socket write error\n"
-msgstr ""
-
-#: src/oauth2.c:544
-msgid "OAuth2 socket timeout error\n"
-msgstr ""
-
-#: src/oauth2.c:638
+#: src/oauth2.c:657
 msgid "OAuth2 access token still fresh\n"
 msgstr ""
 
-#: src/oauth2.c:645
+#: src/oauth2.c:664
 msgid "OAuth2 obtaining access token using refresh token\n"
 msgstr ""
 
-#: src/oauth2.c:649
+#: src/oauth2.c:668
 msgid "OAuth2 trying for fresh access token with authorization code\n"
 msgstr "OAuth2 trying for fresh access token with authorisation code\n"
 
-#: src/oauth2.c:666
+#: src/oauth2.c:688
 msgid "OAuth2 access and refresh token updated\n"
 msgstr ""
 
-#: src/oauth2.c:698
+#: src/oauth2.c:720
 #, c-format
 msgid "OAuth2 original: %s\n"
 msgstr ""
 
-#: src/oauth2.c:699
+#: src/oauth2.c:721
 #, c-format
 msgid "OAuth2 encoded: %s\n"
 msgstr ""
 
-#: src/oauth2.c:700
+#: src/oauth2.c:722
 #, c-format
 msgid ""
 "OAuth2 decoded: %s\n"
 "\n"
 msgstr ""
 
-#: src/password.c:128 src/password.c:129
+#: src/password.c:127 src/password.c:128
 msgid "Input primary passphrase"
 msgstr ""
 
-#: src/password.c:141
+#: src/password.c:140
 msgid "Incorrect primary passphrase."
 msgstr ""
 
@@ -8652,16 +8725,16 @@ msgid ""
 "needs to be entered."
 msgstr ""
 
-#: src/password_gtk.c:174
-msgid "Old passphrase:"
+#: src/password_gtk.c:176
+msgid "Old passphrase"
 msgstr ""
 
-#: src/password_gtk.c:188
-msgid "New passphrase:"
+#: src/password_gtk.c:192
+msgid "New passphrase"
 msgstr ""
 
-#: src/password_gtk.c:199
-msgid "Confirm passphrase:"
+#: src/password_gtk.c:203
+msgid "Confirm passphrase"
 msgstr ""
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:54
@@ -9001,7 +9074,7 @@ msgstr ""
 #: src/plugins/archive/archiver_gtk.c:853
 #: 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
+#: src/prefs_summaries.c:447
 msgid "No"
 msgstr ""
 
@@ -9018,7 +9091,7 @@ msgid "Delete selected files"
 msgstr ""
 
 #: src/plugins/archive/archiver_gtk.c:865
-#: src/plugins/archive/archiver_gtk.c:1327
+#: src/plugins/archive/archiver_gtk.c:1326
 msgid "Select mails before"
 msgstr ""
 
@@ -9030,108 +9103,108 @@ msgstr ""
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:987
+#: src/plugins/archive/archiver_gtk.c:986
 #, c-format
 msgid "%ld of %ld"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1039
 msgid "Create Archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1055
+#: src/plugins/archive/archiver_gtk.c:1054
 msgid "Enter Archiver arguments"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1069
+#: src/plugins/archive/archiver_gtk.c:1068
 msgid "Folder to archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1076
+#: src/plugins/archive/archiver_gtk.c:1075
 msgid "Folder which is the root of the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/archive/archiver_gtk.c:1080
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1087
+#: src/plugins/archive/archiver_gtk.c:1086
 msgid "Name for archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1093
+#: src/plugins/archive/archiver_gtk.c:1092
 msgid "Archive location and name"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1094
 #: src/plugins/archive/archiver_prefs.c:224
-#: src/plugins/pgpcore/select-keys.c:498
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "_Select"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_gtk.c:1097
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1100
+#: src/plugins/archive/archiver_gtk.c:1099
 msgid "Choose compression"
 msgstr ""
 
-#: 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
+#: src/plugins/archive/archiver_gtk.c:1111
+#: src/plugins/archive/archiver_gtk.c:1117
+#: src/plugins/archive/archiver_gtk.c:1123
+#: src/plugins/archive/archiver_gtk.c:1130
+#: src/plugins/archive/archiver_gtk.c:1136
+#: src/plugins/archive/archiver_gtk.c:1144
+#: src/plugins/archive/archiver_gtk.c:1152
+#: src/plugins/archive/archiver_gtk.c:1158
+#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1172
+#: src/plugins/archive/archiver_gtk.c:1179
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1229
+#: src/plugins/archive/archiver_gtk.c:1228
 msgid "Choose format"
 msgstr ""
 
-#: 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
+#: src/plugins/archive/archiver_gtk.c:1240
+#: src/plugins/archive/archiver_gtk.c:1246
+#: src/plugins/archive/archiver_gtk.c:1252
+#: src/plugins/archive/archiver_gtk.c:1258
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1279
+#: src/plugins/archive/archiver_gtk.c:1278
 msgid "Miscellaneous options"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1288
+#: src/plugins/archive/archiver_gtk.c:1287
 msgid "_Recursive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1292
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "Choose this option to include subfolders in the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1294
+#: src/plugins/archive/archiver_gtk.c:1293
 msgid "_MD5sum"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1298
+#: src/plugins/archive/archiver_gtk.c:1297
 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:1302
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid "R_ename"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1306
+#: src/plugins/archive/archiver_gtk.c:1305
 #: src/plugins/archive/archiver_prefs.c:426
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -9139,17 +9212,17 @@ msgid ""
 "Names will be truncated to max 96 characters"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1314
+#: src/plugins/archive/archiver_gtk.c:1313
 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:1318
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid "Selection options"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1334
+#: src/plugins/archive/archiver_gtk.c:1333
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9222,59 +9295,63 @@ msgstr ""
 msgid "Choose this option to delete mails after archiving"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:337
+#: src/plugins/att_remover/att_remover.c:303
+msgid "Filename"
+msgstr ""
+
+#: src/plugins/att_remover/att_remover.c:334
 msgid "Remove attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:363
+#: src/plugins/att_remover/att_remover.c:359
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:645
+#: src/plugins/att_remover/att_remover.c:367 src/prefs_summaries.c:710
 #: src/prefs_summary_column.c:79 src/summaryview.c:2878
 msgid "Attachment"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:425
+#: src/plugins/att_remover/att_remover.c:421
 msgid "Destroy attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:422
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:469
+#: src/plugins/att_remover/att_remover.c:465
 msgid "The selected messages don't have any attachments."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:472
+#: src/plugins/att_remover/att_remover.c:468
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:475
+#: src/plugins/att_remover/att_remover.c:471
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:504
+#: src/plugins/att_remover/att_remover.c:500
 msgid "This message doesn't have any attachments."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:517
+#: src/plugins/att_remover/att_remover.c:513
 msgid "Remove attachments..."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:529
-#: src/plugins/att_remover/att_remover.c:589
+#: src/plugins/att_remover/att_remover.c:525
+#: src/plugins/att_remover/att_remover.c:585
 msgid "AttRemover"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:594
+#: src/plugins/att_remover/att_remover.c:590
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9282,7 +9359,7 @@ msgid ""
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:618
+#: src/plugins/att_remover/att_remover.c:614
 msgid "Attachment handling"
 msgstr ""
 
@@ -9372,37 +9449,37 @@ msgstr ""
 msgid "Exclude"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:80
+#: src/plugins/bogofilter/bogofilter.c:81
 #: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:106
+#: src/plugins/bogofilter/bogofilter.c:109
 #: 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:104 src/plugins/bsfilter/bsfilter_gtk.c:196
+#: src/plugins/bsfilter/bsfilter.c:107 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.c:121
 #: 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: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
+#: src/prefs_matcher.c:1673 src/prefs_matcher.c:1675 src/prefs_matcher.c:2585
+#: src/prefs_matcher.c:2589
 msgid "Any"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:459
 msgid "Bogofilter: fetching bodies..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:472
 msgid "Bogofilter: filtering messages..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:588
 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"
@@ -9410,35 +9487,35 @@ msgid ""
 "with a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:595
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:740
+#: src/plugins/bogofilter/bogofilter.c:743
 msgid "Bogofilter: learning from message..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:753
-#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:485
+#: src/plugins/bogofilter/bogofilter.c:756
+#: src/plugins/bogofilter/bogofilter.c:803 src/plugins/bsfilter/bsfilter.c:489
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:768
+#: src/plugins/bogofilter/bogofilter.c:771
 msgid "Bogofilter: learning from messages..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:856
+#: src/plugins/bogofilter/bogofilter.c:859
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:984
+#: src/plugins/bogofilter/bogofilter.c:987
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9454,13 +9531,13 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:648
-#: src/plugins/spamassassin/spamassassin.c:647
+#: src/plugins/bogofilter/bogofilter.c:1020 src/plugins/bsfilter/bsfilter.c:652
+#: src/plugins/spamassassin/spamassassin.c:651
 msgid "Spam detection"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:648
+#: src/plugins/bogofilter/bogofilter.c:1021 src/plugins/bsfilter/bsfilter.c:653
+#: src/plugins/spamassassin/spamassassin.c:652
 msgid "Spam learning"
 msgstr ""
 
@@ -9484,7 +9561,8 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:162
-#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1684
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1720
+#: src/prefs_compose_writing.c:205
 msgid "KiB"
 msgstr ""
 
@@ -9581,19 +9659,19 @@ msgstr ""
 msgid "Mark spam as read"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:79 src/plugins/bsfilter/bsfilter_gtk.c:400
+#: src/plugins/bsfilter/bsfilter.c:80 src/plugins/bsfilter/bsfilter_gtk.c:400
 msgid "Bsfilter"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:271
+#: src/plugins/bsfilter/bsfilter.c:274
 msgid "Bsfilter: fetching body..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:280
+#: src/plugins/bsfilter/bsfilter.c:283
 msgid "Bsfilter: filtering message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:365
+#: src/plugins/bsfilter/bsfilter.c:369
 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"
@@ -9601,18 +9679,18 @@ msgid ""
 "a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:372
+#: src/plugins/bsfilter/bsfilter.c:376
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:474
+#: src/plugins/bsfilter/bsfilter.c:478
 msgid "Bsfilter: learning from message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:615
+#: src/plugins/bsfilter/bsfilter.c:619
 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 "
@@ -9892,65 +9970,52 @@ msgid ""
 "It is not really useful."
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:137
 msgid "Display images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:148
+#: src/plugins/fancy/fancy_prefs.c:138
 msgid "Display embedded images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:142
 msgid "Execute javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:153
+#: src/plugins/fancy/fancy_prefs.c:143
 msgid "Execute embedded javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Execute Java applets"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:158
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Execute embedded Java applets"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Render objects using plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:163
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Render embedded objects using plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:170
+#: src/plugins/fancy/fancy_prefs.c:160
 msgid "Open in Viewer (remote content is enabled)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:173
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Do nothing (remote content is disabled)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4254
-#: src/prefs_proxy.c:237
-msgid "Proxy"
-msgstr ""
-
 #: src/plugins/fancy/fancy_prefs.c:212
-msgid "Use GNOME's proxy settings"
-msgstr ""
-
-#: src/plugins/fancy/fancy_prefs.c:220
-msgid "Use proxy"
-msgstr ""
-
-#: src/plugins/fancy/fancy_prefs.c:238
 #: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:239
+#: src/plugins/fancy/fancy_prefs.c:213
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -9959,115 +10024,120 @@ msgid ""
 "in the email."
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/fancy/fancy_prefs.c:220
 #: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:278
+#: src/plugins/fancy/fancy_prefs.c:252
 msgid "When clicking on a link, by default"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:286
+#: src/plugins/fancy/fancy_prefs.c:260
 msgid "Open in External Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:300
+#: src/plugins/fancy/fancy_prefs.c:274
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/fancy/fancy_prefs.c:284
 #: 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
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:182
+#: src/prefs_account.c:1620 src/prefs_account.c:1742 src/prefs_account.c:2540
+#: src/prefs_customheader.c:227
 msgid "Bro_wse"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:352
+#: src/plugins/fancy/fancy_prefs.c:322
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:477
+#: src/plugins/fancy/fancy_viewer.c:480
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:586
+#: src/plugins/fancy/fancy_viewer.c:589
 msgid "Load images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:588
+#: src/plugins/fancy/fancy_viewer.c:591
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:590
+#: src/plugins/fancy/fancy_viewer.c:593
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:592
+#: src/plugins/fancy/fancy_viewer.c:595
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:594
+#: src/plugins/fancy/fancy_viewer.c:597
 msgid "Enable Java"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:596
+#: src/plugins/fancy/fancy_viewer.c:599
 msgid "Open links with external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:792
+#: src/plugins/fancy/fancy_viewer.c:795
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:852
+#: src/plugins/fancy/fancy_viewer.c:855
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:874
+#: src/plugins/fancy/fancy_viewer.c:877
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:883
+#: src/plugins/fancy/fancy_viewer.c:886
 msgid "Open in Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:893
+#: src/plugins/fancy/fancy_viewer.c:896
 msgid "Open Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:902
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Copy Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:907
+#: src/plugins/fancy/fancy_viewer.c:910
 msgid "Download Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:918
+#: src/plugins/fancy/fancy_viewer.c:921
 msgid "Save Image As"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:928
+#: src/plugins/fancy/fancy_viewer.c:931
 msgid "Copy Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:966
+#: src/plugins/fancy/fancy_viewer.c:969
 msgid "Import feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1259
+#: src/plugins/fancy/fancy_viewer.c:1242
 msgid "Fancy"
 msgstr ""
 
+#: src/plugins/fancy/fancy_viewer.c:1263
+#, c-format
+msgid "Failed to find the companion WebKit extension %s"
+msgstr ""
+
 #. TRANSLATORS: 'Fancy' here is name of the plugin, not the english word.
-#: src/plugins/fancy/fancy_viewer.c:1287
+#: src/plugins/fancy/fancy_viewer.c:1292
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1292
+#: src/plugins/fancy/fancy_viewer.c:1297
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10157,180 +10227,6 @@ msgid ""
 "RFC822 format"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:130
-msgid "GData plugin: Authorization required"
-msgstr "GData plugin: Authorisation required"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:132
-msgid ""
-"You need to authorize Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorization page by pressing the button below. After you "
-"confirmed the authorization, you will get an authorization code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-msgstr ""
-"You need to authorise Claws Mail to access your Google contact list to use "
-"the GData plugin.\n"
-"\n"
-"Visit Google's authorisation page by pressing the button below. After you "
-"confirmed the authorisation, you will get an authorisation code. Enter that "
-"code in the field below to grant Claws Mail access to your Google contact "
-"list."
-
-#: src/plugins/gdata/cm_gdata_contacts.c:147
-msgid "Step 1:"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:153
-msgid "Click here to open the Google authorization page in a browser"
-msgstr "Click here to open the Google authorisation page in a browser"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:157
-msgid "Step 2:"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:163
-msgid "Enter code:"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:331
-#, c-format
-msgid "GData plugin: Error querying for contacts: %s\n"
-msgstr ""
-
-#. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
-#, c-format
-msgid "Added %d of"
-msgid_plural "Added %d of"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:349
-#, c-format
-msgid "1 contact to the cache"
-msgid_plural "%d contacts to the cache"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:359
-msgid "GData plugin: Starting async contacts query\n"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:380
-#, c-format
-msgid "GData plugin: Error querying for groups: %s\n"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:417
-msgid "GData plugin: Groups received\n"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:424
-msgid "GData plugin: Starting async groups query\n"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:449
-#, c-format
-msgid "GData plugin: Authorization error: %s\n"
-msgstr "GData plugin: Authorisation error: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:456
-msgid "GData plugin: Authorization successful\n"
-msgstr "GData plugin: Authorisation successful\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:476
-msgid "GData plugin: Starting interactive authorization\n"
-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 authorisation code, requesting authorisation\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:490
-msgid ""
-"GData plugin: No authorization code received, authorization request "
-"cancelled\n"
-msgstr ""
-"GData plugin: No authorisation code received, authorisation request "
-"cancelled\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:496
-msgid ""
-"GData plugin: Interactive authorization still running, no additional session "
-"started\n"
-msgstr ""
-"GData plugin: Interactive authorisation still running, no additional session "
-"started\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:513
-#, c-format
-msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr "GData plugin: Authorisation refresh error: %s\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:537
-msgid "GData plugin: Authorization refresh successful\n"
-msgstr "GData plugin: Authorisation refresh successful\n"
-
-#: src/plugins/gdata/cm_gdata_contacts.c:597
-#, c-format
-msgid ""
-"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_contacts.c:605
-msgid "GData plugin: Trying to refresh authorization\n"
-msgstr "GData plugin: Trying to refresh authorisation\n"
-
-#: src/plugins/gdata/cm_gdata_prefs.c:80
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1990
-msgid "Authentication"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_prefs.c:86
-#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1580
-msgid "Username:"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_prefs.c:99
-msgid "Polling interval (seconds):"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_prefs.c:106
-msgid "Maximum number of results:"
-msgstr ""
-
-#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
-#: src/plugins/gdata/gdata_plugin.c:165
-msgid "GData"
-msgstr ""
-
-#: src/plugins/gdata/gdata_plugin.c:108
-msgid "Failed to register address completion hook in the GData plugin"
-msgstr ""
-
-#: src/plugins/gdata/gdata_plugin.c:115
-msgid "Failed to register offline switch hook in the GData plugin"
-msgstr ""
-
-#: src/plugins/gdata/gdata_plugin.c:170
-msgid ""
-"This plugin provides access to the GData protocol for Claws Mail.\n"
-"\n"
-"The GData protocol is an interface to Google services.\n"
-"Currently, the only implemented functionality is to include Google Contacts "
-"into the Tab-address completion.\n"
-"\n"
-"Feedback to <berndth at gmx.de> is welcome."
-msgstr ""
-
-#: src/plugins/gdata/gdata_plugin.c:196
-msgid "GData integration"
-msgstr ""
-
 #: src/plugins/keyword_warner/keyword_warner.c:189
 #, c-format
 msgid ""
@@ -10363,7 +10259,7 @@ msgstr ""
 #: src/plugins/libravatar/libravatar.c:334
 #: src/plugins/libravatar/libravatar.c:399
 #: src/plugins/libravatar/libravatar.c:459
-#: src/plugins/libravatar/libravatar_prefs.c:564
+#: src/plugins/libravatar/libravatar_prefs.c:568
 msgid "Libravatar"
 msgstr ""
 
@@ -10403,29 +10299,29 @@ msgstr ""
 msgid "Error reading cache stats"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
+#: src/plugins/libravatar/libravatar_prefs.c:149
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:159
+#: src/plugins/libravatar/libravatar_prefs.c:163
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:173
+#: src/plugins/libravatar/libravatar_prefs.c:177
 msgid "Clear icon cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:174
+#: src/plugins/libravatar/libravatar_prefs.c:178
 msgid "Are you sure you want to remove all cached avatar icons?"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:187
+#: src/plugins/libravatar/libravatar_prefs.c:191
 msgid "Not enough memory for operation"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:192
+#: src/plugins/libravatar/libravatar_prefs.c:196
 #, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
@@ -10433,11 +10329,11 @@ msgid ""
 "• %u files removed."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:197
+#: src/plugins/libravatar/libravatar_prefs.c:201
 msgid "Icon cache successfully cleared!"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:200
+#: src/plugins/libravatar/libravatar_prefs.c:204
 #, c-format
 msgid ""
 "Errors clearing icon cache:\n"
@@ -10447,144 +10343,144 @@ msgid ""
 "• %u files couldn't be removed."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:207
+#: src/plugins/libravatar/libravatar_prefs.c:211
 msgid "Error clearing icon cache."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:222
+#: src/plugins/libravatar/libravatar_prefs.c:226
 msgid "_Use cached icons"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:223
+#: src/plugins/libravatar/libravatar_prefs.c:227
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:238
+#: src/plugins/libravatar/libravatar_prefs.c:242
 msgid "Cache refresh interval"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:238
-#: 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
+#: src/plugins/libravatar/libravatar_prefs.c:242
+#: src/plugins/vcalendar/vcal_prefs.c:324 src/prefs_account.c:1699
+#: src/prefs_account.c:1876 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Mystery man"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:321
 msgid "Identicon"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:322
 msgid "MonsterID"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Wavatar"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:320
+#: src/plugins/libravatar/libravatar_prefs.c:324
 msgid "Retro"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:321
+#: src/plugins/libravatar/libravatar_prefs.c:325
 msgid "Robohash"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:322
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "Pagan"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:323
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "Custom URL"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:326
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A blank image"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:327
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:328
+#: src/plugins/libravatar/libravatar_prefs.c:332
 msgid "A generated geometric pattern"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:329
+#: src/plugins/libravatar/libravatar_prefs.c:333
 msgid "A generated full-body monster"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:330
+#: src/plugins/libravatar/libravatar_prefs.c:334
 msgid "A generated almost unique face"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:331
+#: src/plugins/libravatar/libravatar_prefs.c:335
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:332
+#: src/plugins/libravatar/libravatar_prefs.c:336
 msgid "A generated robotic character"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:333
+#: src/plugins/libravatar/libravatar_prefs.c:337
 msgid "A generated retro adventure game character"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:334
+#: src/plugins/libravatar/libravatar_prefs.c:338
 msgid "Redirect to a user provided URL"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:348
+#: src/plugins/libravatar/libravatar_prefs.c:352
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:398
+#: src/plugins/libravatar/libravatar_prefs.c:402
 msgid "_Allow redirects to other sites"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:399
+#: src/plugins/libravatar/libravatar_prefs.c:403
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:408
+#: src/plugins/libravatar/libravatar_prefs.c:412
 msgid "_Enable federated servers"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:409
+#: src/plugins/libravatar/libravatar_prefs.c:413
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:426
+#: src/plugins/libravatar/libravatar_prefs.c:430
 msgid "Request timeout"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:426
+#: src/plugins/libravatar/libravatar_prefs.c:430
 msgid "second(s)"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:427
+#: src/plugins/libravatar/libravatar_prefs.c:431
 msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:473
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Icon cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:477
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Default missing icon mode"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:481
+#: src/plugins/libravatar/libravatar_prefs.c:485
 msgid "Network"
 msgstr ""
 
@@ -10603,11 +10499,11 @@ msgstr ""
 msgid "Default font"
 msgstr ""
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:95
+#: src/plugins/litehtml_viewer/lh_widget.cpp:91
 msgid "Open Link"
 msgstr ""
 
-#: src/plugins/litehtml_viewer/lh_widget.cpp:99
+#: src/plugins/litehtml_viewer/lh_widget.cpp:95
 msgid "Copy Link Location"
 msgstr ""
 
@@ -10698,7 +10594,7 @@ msgstr ""
 msgid "sending error on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5824
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5825
 msgid "_Filter"
 msgstr ""
 
@@ -10830,7 +10726,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1293
 msgid "Server information"
 msgstr ""
 
@@ -10866,8 +10762,12 @@ msgstr ""
 msgid "Require STARTTLS"
 msgstr ""
 
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2049
+msgid "Authentication"
+msgstr ""
+
 #: src/plugins/managesieve/sieve_prefs.c:202
-#: src/plugins/rssyl/rssyl_feed_props.c:267
+#: src/plugins/rssyl/rssyl_feed_props.c:263
 msgid "No authentication"
 msgstr ""
 
@@ -10881,28 +10781,28 @@ msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:392
-#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1432
-#: src/prefs_account.c:2037
+#: src/plugins/vcalendar/vcal_prefs.c:511 src/prefs_account.c:1464
+#: src/prefs_account.c:2099
 msgid "User ID"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:246
-#: src/plugins/rssyl/rssyl_feed_props.c:382
+#: src/plugins/rssyl/rssyl_feed_props.c:378
 #: 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:134
+#: src/plugins/vcalendar/vcal_prefs.c:519 src/prefs_account.c:1469
+#: src/prefs_account.c:2122 src/prefs_account.c:3063 src/prefs_account.c:3091
+#: src/prefs_account.c:3286 src/prefs_proxy.c:134
 msgid "Password"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
-#: src/prefs_account.c:1745 src/prefs_account.c:2008
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1648
+#: src/prefs_account.c:1781 src/prefs_account.c:2067
 msgid "Authentication method"
 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:1219
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1791
+#: src/prefs_account.c:2076 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1198
 msgid "Automatic"
 msgstr ""
 
@@ -10918,20 +10818,20 @@ msgstr ""
 msgid "Sieve"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:108 src/plugins/newmail/newmail.c:151
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:113
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:130
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:143
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10942,7 +10842,7 @@ msgid ""
 "Current log is %s"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:177
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr ""
 
@@ -10950,11 +10850,11 @@ msgstr ""
 msgid "Folder:"
 msgstr ""
 
-#: src/plugins/notification/notification_foldercheck.c:479
+#: src/plugins/notification/notification_foldercheck.c:478
 msgid "Select folder(s)"
 msgstr ""
 
-#: src/plugins/notification/notification_foldercheck.c:581
+#: src/plugins/notification/notification_foldercheck.c:578
 msgid "select recursively"
 msgstr ""
 
@@ -11190,13 +11090,13 @@ msgid "Show banner"
 msgstr ""
 
 #: src/plugins/notification/notification_prefs.c:768
-#: src/plugins/pgpcore/select-keys.c:238 src/plugins/pgpcore/sgpgme.c:334
+#: src/plugins/pgpcore/select-keys.c:236 src/plugins/pgpcore/sgpgme.c:334
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr ""
 
 #: src/plugins/notification/notification_prefs.c:770 src/prefs_receive.c:229
-#: src/prefs_summaries.c:525 src/prefs_summaries.c:578
+#: src/prefs_summaries.c:590 src/prefs_summaries.c:643
 msgid "Always"
 msgstr ""
 
@@ -11533,68 +11433,68 @@ msgstr ""
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1795
-#: src/plugins/pdf_viewer/poppler_viewer.c:2007
+#: src/plugins/pdf_viewer/poppler_viewer.c:1794
+#: src/plugins/pdf_viewer/poppler_viewer.c:2006
 msgid "Document Index"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1971
 msgid "First Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1974
 msgid "Previous Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Next Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Last Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Zoom In"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1986
+#: src/plugins/pdf_viewer/poppler_viewer.c:1985
 msgid "Zoom Out"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1989
+#: src/plugins/pdf_viewer/poppler_viewer.c:1988
 msgid "Fit Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1992
+#: src/plugins/pdf_viewer/poppler_viewer.c:1991
 msgid "Fit Page Width"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1994
 msgid "Rotate Left"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1998
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Rotate Right"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2001
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Print Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2004
+#: src/plugins/pdf_viewer/poppler_viewer.c:2003
 msgid "Document Info"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2009
+#: src/plugins/pdf_viewer/poppler_viewer.c:2008
 msgid "Page Number"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2011
+#: src/plugins/pdf_viewer/poppler_viewer.c:2010
 msgid "Zoom Factor"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2120
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11603,13 +11503,13 @@ msgid ""
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2128
-#: src/plugins/pdf_viewer/poppler_viewer.c:2136
-#: src/plugins/pdf_viewer/poppler_viewer.c:2156
+#: src/plugins/pdf_viewer/poppler_viewer.c:2126
+#: src/plugins/pdf_viewer/poppler_viewer.c:2134
+#: src/plugins/pdf_viewer/poppler_viewer.c:2154
 msgid "PDF Viewer"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2132
+#: src/plugins/pdf_viewer/poppler_viewer.c:2130
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11774,9 +11674,9 @@ 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:463
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1827
-#: src/prefs_account.c:2126 src/prefs_receive.c:190
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:459
+#: src/plugins/rssyl/rssyl_prefs.c:150 src/prefs_account.c:1883
+#: src/prefs_account.c:2188 src/prefs_receive.c:190
 msgid "minutes"
 msgstr ""
 
@@ -11839,64 +11739,64 @@ msgstr ""
 msgid "S/MIME"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:98
+#: src/plugins/pgpcore/select-keys.c:96
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:101
+#: src/plugins/pgpcore/select-keys.c:99
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:235 src/plugins/pgpcore/sgpgme.c:332
+#: src/plugins/pgpcore/select-keys.c:233 src/plugins/pgpcore/sgpgme.c:332
 msgid "Undefined"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:241 src/plugins/pgpcore/sgpgme.c:336
+#: src/plugins/pgpcore/select-keys.c:239 src/plugins/pgpcore/sgpgme.c:336
 #: src/plugins/pgpcore/sgpgme.c:352
 msgid "Marginal"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:340
+#: src/plugins/pgpcore/select-keys.c:245 src/plugins/pgpcore/sgpgme.c:340
 #: src/plugins/pgpcore/sgpgme.c:356
 msgid "Ultimate"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:412
+#: src/plugins/pgpcore/select-keys.c:410
 msgid "Select Keys"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:462
+#: src/plugins/pgpcore/select-keys.c:460
 msgid "Key ID"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:480
+#: src/plugins/pgpcore/select-keys.c:478
 msgid "Trust"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:499
+#: src/plugins/pgpcore/select-keys.c:497
 msgid "_Other"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:500
+#: src/plugins/pgpcore/select-keys.c:498
 msgid "Do_n't encrypt"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:681
+#: src/plugins/pgpcore/select-keys.c:679
 msgid "Add key"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:682
+#: src/plugins/pgpcore/select-keys.c:680
 msgid "Enter another user or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:704
+#: src/plugins/pgpcore/select-keys.c:702
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:705
+#: src/plugins/pgpcore/select-keys.c:703
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11908,7 +11808,7 @@ msgid ""
 "Do you trust this key enough to use it anyway?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:281 src/privacy.c:286
+#: src/plugins/pgpcore/sgpgme.c:270 src/privacy.c:279 src/privacy.c:284
 msgid "No signature found"
 msgstr ""
 
@@ -11978,157 +11878,157 @@ msgstr ""
 msgid "The signature has not been checked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:516
+#: src/plugins/pgpcore/sgpgme.c:515
 msgid "Error checking signature: no status\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:535
+#: src/plugins/pgpcore/sgpgme.c:534
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:553
+#: src/plugins/pgpcore/sgpgme.c:552
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:559
+#: src/plugins/pgpcore/sgpgme.c:558
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:563
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:569
+#: src/plugins/pgpcore/sgpgme.c:568
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/plugins/pgpcore/sgpgme.c:573
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:579
+#: src/plugins/pgpcore/sgpgme.c:578
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:591
+#: src/plugins/pgpcore/sgpgme.c:590
 #, c-format
 msgid "                    uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:593
+#: src/plugins/pgpcore/sgpgme.c:592
 msgid "Revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:598
+#: src/plugins/pgpcore/sgpgme.c:597
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:599
+#: src/plugins/pgpcore/sgpgme.c:598
 msgid "No key!"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:600
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:619
+#: src/plugins/pgpcore/sgpgme.c:618
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:625
+#: src/plugins/pgpcore/sgpgme.c:624
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:660
+#: src/plugins/pgpcore/sgpgme.c:656
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:676
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:855
+#: src/plugins/pgpcore/sgpgme.c:851
 msgid "Secret key specification is ambiguous"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:865
+#: src/plugins/pgpcore/sgpgme.c:861
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:878
+#: src/plugins/pgpcore/sgpgme.c:874
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:967
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:977
+#: src/plugins/pgpcore/sgpgme.c:973
 #, 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:985
+#: src/plugins/pgpcore/sgpgme.c:981
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:997
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1078
+#: src/plugins/pgpcore/sgpgme.c:1074
 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:1083
+#: src/plugins/pgpcore/sgpgme.c:1079
 msgid "No PGP key found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1084
+#: src/plugins/pgpcore/sgpgme.c:1080
 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:1174 src/plugins/pgpcore/sgpgme.c:1196
+#: src/plugins/pgpcore/sgpgme.c:1170 src/plugins/pgpcore/sgpgme.c:1192
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1184
+#: src/plugins/pgpcore/sgpgme.c:1180
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1202
+#: src/plugins/pgpcore/sgpgme.c:1198
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1206
+#: src/plugins/pgpcore/sgpgme.c:1202
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12137,15 +12037,15 @@ msgid ""
 "Do you want to export it to a keyserver?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1210
+#: src/plugins/pgpcore/sgpgme.c:1206
 msgid "Key generated"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1286
+#: src/plugins/pgpcore/sgpgme.c:1282
 msgid "Key exported."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1288
+#: src/plugins/pgpcore/sgpgme.c:1284
 msgid "Couldn't export key."
 msgstr ""
 
@@ -12325,12 +12225,12 @@ msgid "Show Python console..."
 msgstr ""
 
 #: src/plugins/python/python_plugin.c:525
-#: src/plugins/rssyl/rssyl_feed_props.c:470
+#: src/plugins/rssyl/rssyl_feed_props.c:466
 msgid "Refresh"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2987
-#: src/prefs_account.c:3015 src/prefs_account.c:3444 src/wizard.c:1217
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:3052
+#: src/prefs_account.c:3080 src/prefs_account.c:3509 src/wizard.c:1217
 #: src/wizard.c:1659
 msgid "Browse"
 msgstr ""
@@ -12402,26 +12302,26 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:111
+#: src/plugins/rssyl/opml_export.c:108
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:132
+#: src/plugins/rssyl/opml_export.c:129
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:142
+#: src/plugins/rssyl/opml_export.c:139
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:183
+#: src/plugins/rssyl/opml_export.c:180
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr ""
 
-#: src/plugins/rssyl/opml_import.c:109
+#: src/plugins/rssyl/opml_import.c:105
 #, c-format
 msgid ""
 "Error while subscribing feed\n"
@@ -12430,7 +12330,7 @@ msgid ""
 "Folder name '%s' is not allowed."
 msgstr ""
 
-#: src/plugins/rssyl/plugin.c:65
+#: src/plugins/rssyl/plugin.c:61
 msgid ""
 "This plugin allows you to create a mailbox tree where you can add newsfeeds "
 "in RSS 1.0, RSS 2.0 or Atom format.\n"
@@ -12439,320 +12339,320 @@ msgid ""
 "the web. You can read them, and delete or keep old entries."
 msgstr ""
 
-#: src/plugins/rssyl/plugin.c:89
+#: src/plugins/rssyl/plugin.c:85
 msgid "RSS feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_add_item.c:304
+#: src/plugins/rssyl/rssyl_add_item.c:300
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:168
+#: src/plugins/rssyl/rssyl.c:152 src/plugins/rssyl/rssyl.c:164
 msgid "Refresh all feeds"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:99
+#: src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "Subscribe feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:100
+#: src/plugins/rssyl/rssyl_cb_menu.c:95
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:136
+#: src/plugins/rssyl/rssyl_cb_menu.c:131
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:286 src/plugins/rssyl/rssyl_cb_menu.c:333
-#: src/plugins/rssyl/rssyl_feed_props.c:201
+#: src/plugins/rssyl/rssyl_cb_menu.c:281 src/plugins/rssyl/rssyl_cb_menu.c:328
+#: src/plugins/rssyl/rssyl_feed_props.c:197
 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:359
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:360
+#: src/plugins/rssyl/rssyl_cb_menu.c:355
 msgid "Remove feed tree"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:395
+#: src/plugins/rssyl/rssyl_cb_menu.c:390
 msgid "Select an OPML file"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:10
+#: src/plugins/rssyl/rssyl_feed.h:28
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:11
+#: src/plugins/rssyl/rssyl_feed.h:29
 #, c-format
 msgid "RSSyl: New feed subscribed: '%s' (%s)\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:12
+#: src/plugins/rssyl/rssyl_feed.h:30
 #, c-format
 msgid "RSSyl: Updating feed: %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:13
+#: src/plugins/rssyl/rssyl_feed.h:31
 #, c-format
 msgid "RSSyl: Feed update finished: %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:14
+#: src/plugins/rssyl/rssyl_feed.h:32
 #, c-format
 msgid "RSSyl: Error fetching feed at '%s': %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:15
+#: src/plugins/rssyl/rssyl_feed.h:33
 #, c-format
 msgid "RSSyl: No valid feed found at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:16
+#: src/plugins/rssyl/rssyl_feed.h:34
 #, c-format
 msgid "RSSyl: Couldn't process feed at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.h:17
+#: src/plugins/rssyl/rssyl_feed.h:35
 #, c-format
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:269
+#: src/plugins/rssyl/rssyl_feed_props.c:265
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:287
 msgid "Use default refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:299
 msgid "Keep old items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:305
 msgid "_Trim"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:307
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:314
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "Fetch comments if possible"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:334
+#: src/plugins/rssyl/rssyl_feed_props.c:330
 msgid "Always mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:336
+#: src/plugins/rssyl/rssyl_feed_props.c:332
 msgid "Only mark it as new if its text has changed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:338
+#: src/plugins/rssyl/rssyl_feed_props.c:334
 msgid "Never mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Add item title to the top of message"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:350
+#: src/plugins/rssyl/rssyl_feed_props.c:346
 msgid "Ignore title rename"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:355
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 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:359
+#: src/plugins/rssyl/rssyl_feed_props.c:355
 #: src/plugins/vcalendar/vcal_prefs.c:594
 msgid "Verify TLS certificate validity"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:379
+#: src/plugins/rssyl/rssyl_feed_props.c:375
 msgid "User name"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:388
 msgid "Source URL"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:401
 msgid "Fetch comments on posts aged less than"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:413
+#: src/plugins/rssyl/rssyl_feed_props.c:409
 #: 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
+#: src/prefs_account.c:1689 src/prefs_folder_item.c:590 src/prefs_matcher.c:340
 msgid "days"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/rssyl/rssyl_feed_props.c:410
 msgid "Set to -1 to fetch all comments"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:438
+#: src/plugins/rssyl/rssyl_feed_props.c:434
 msgid "If an item changes"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:443
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "Items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:452
 msgid "Refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_feed_props.c:460
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:496
+#: src/plugins/rssyl/rssyl_feed_props.c:492
 msgid "Set feed properties"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:48
+#: src/plugins/rssyl/rssyl_gtk.c:44
 msgid "_Refresh feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:49
+#: src/plugins/rssyl/rssyl_gtk.c:45
 msgid "Feed pr_operties"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:50
+#: src/plugins/rssyl/rssyl_gtk.c:46
 msgid "Rena_me..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:51
+#: src/plugins/rssyl/rssyl_gtk.c:47
 msgid "R_efresh recursively"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:52
+#: src/plugins/rssyl/rssyl_gtk.c:48
 msgid "Subscribe _new feed..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:53
+#: src/plugins/rssyl/rssyl_gtk.c:49
 msgid "Create new _folder..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:54
+#: src/plugins/rssyl/rssyl_gtk.c:50
 msgid "Import feed list..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:56
+#: src/plugins/rssyl/rssyl_gtk.c:52
 msgid "Remove tree"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:126
+#: src/plugins/rssyl/rssyl_gtk.c:122
 msgid "Add RSS folder tree"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:127
+#: src/plugins/rssyl/rssyl_gtk.c:123
 msgid "Enter name for a new RSS folder tree."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_gtk.c:143
+#: src/plugins/rssyl/rssyl_gtk.c:139
 msgid ""
 "Creation of folder tree failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there?"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl.h:20
+#: src/plugins/rssyl/rssyl.h:38
 msgid "My Feeds"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:111
+#: src/plugins/rssyl/rssyl_prefs.c:107
 msgid "Select cookies file"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:141
+#: src/plugins/rssyl/rssyl_prefs.c:137
 msgid "Default refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:161
-msgid "Refresh all feeds on application start"
+#: src/plugins/rssyl/rssyl_prefs.c:157
+msgid "Refresh all feeds on start-up"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:170
+#: src/plugins/rssyl/rssyl_prefs.c:166
 msgid "Verify TLS certificates validity for new feeds"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:177
+#: src/plugins/rssyl/rssyl_prefs.c:173
 msgid "Path to cookies file"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:184
+#: src/plugins/rssyl/rssyl_prefs.c:180
 msgid "Path to Netscape-style cookies.txt file containing your cookies"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:195
+#: src/plugins/rssyl/rssyl_prefs.c:191
 msgid "Refreshing"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_prefs.c:199
+#: src/plugins/rssyl/rssyl_prefs.c:195
 msgid "Security and privacy"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_subscribe.c:158
+#: src/plugins/rssyl/rssyl_subscribe.c:154
 #, c-format
 msgid "Couldn't create folder for new feed '%s'."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:43
 msgid "Subscribe new feed?"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:64
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:60
 msgid "Feed folder:"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:70
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid "_Edit feed properties after subscribing"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_comments.c:109
+#: src/plugins/rssyl/rssyl_update_comments.c:108
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:107
-#: src/plugins/vcalendar/vcal_folder.c:1628
+#: src/plugins/rssyl/rssyl_update_feed.c:106
+#: src/plugins/vcalendar/vcal_folder.c:1623
 msgid "401 (Authorisation required)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/rssyl/rssyl_update_feed.c:109
 msgid "403 (Forbidden)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:113
-#: src/plugins/vcalendar/vcal_folder.c:1634
+#: src/plugins/rssyl/rssyl_update_feed.c:112
+#: src/plugins/vcalendar/vcal_folder.c:1629
 msgid "404 (Not found)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:116
+#: src/plugins/rssyl/rssyl_update_feed.c:115
 #, c-format
 msgid "Error %d"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:129
+#: src/plugins/rssyl/rssyl_update_feed.c:128
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -12762,28 +12662,28 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:142
+#: src/plugins/rssyl/rssyl_update_feed.c:141
 #, c-format
 msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:153
 msgid "Untitled feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:156
+#: src/plugins/rssyl/rssyl_update_feed.c:155
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:233
+#: src/plugins/rssyl/rssyl_update_feed.c:232
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:270
+#: src/plugins/rssyl/rssyl_update_feed.c:269
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -12792,11 +12692,11 @@ msgid ""
 "Please contact developers, this should not happen."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:356
+#: src/plugins/rssyl/rssyl_update_feed.c:355
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_format.c:128
+#: src/plugins/rssyl/rssyl_update_format.c:127
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -12873,62 +12773,66 @@ msgstr ""
 msgid "Spam reporting"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:137
+#: src/plugins/spam_report/spam_report_prefs.c:138
 msgid "Enabled"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:167
+#: src/plugins/spam_report/spam_report_prefs.c:168
 msgid "Forward to:"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1227
+#: src/plugins/spam_report/spam_report_prefs.c:171 src/wizard.c:1580
+msgid "Username:"
+msgstr ""
+
+#: src/plugins/spam_report/spam_report_prefs.c:182 src/wizard.c:1227
 #: src/wizard.c:1595 src/wizard.c:1669
 msgid "Password:"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin.c:79
 #: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:182
+#: src/plugins/spamassassin/spamassassin.c:185
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:198
+#: src/plugins/spamassassin/spamassassin.c:201
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:224
+#: src/plugins/spamassassin/spamassassin.c:227
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:229
+#: src/plugins/spamassassin/spamassassin.c:232
 msgid "SpamAssassin: filtering message..."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:358
+#: src/plugins/spamassassin/spamassassin.c:362
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:416
+#: src/plugins/spamassassin/spamassassin.c:420
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:565
+#: src/plugins/spamassassin/spamassassin.c:569
 msgid "Failed to get username"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:582
+#: src/plugins/spamassassin/spamassassin.c:586
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:616
+#: src/plugins/spamassassin/spamassassin.c:620
 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 "
@@ -13354,84 +13258,89 @@ msgstr ""
 msgid "Action:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:164
 msgid "_New meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:165
 msgid "_Export calendar..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:166
 msgid "_Subscribe to Webcal..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_Rename..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "U_pdate subscriptions"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_List view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:175
+#: src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Week view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:176
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Month view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1103
+#: src/plugins/vcalendar/vcal_folder.c:1099
 msgid "Meetings"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1477
+#: src/plugins/vcalendar/vcal_manager.c:1348
+msgid "[no summary]"
+msgstr ""
+
+#: src/plugins/vcalendar/vcal_folder.c:1498
 msgid "in the past"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1501
 msgid "today"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1504
 msgid "tomorrow"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1507
 msgid "this week"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1515
+#: src/plugins/vcalendar/vcal_folder.c:1510
 msgid "later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1519
+#: src/plugins/vcalendar/vcal_folder.c:1514
 #, c-format
 msgid ""
 "\n"
 "These are the events planned %s:\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1619
+#: src/plugins/vcalendar/vcal_folder.c:1614
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1631
+#: src/plugins/vcalendar/vcal_folder.c:1626
 msgid "403 (Unauthorised)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1637
+#: src/plugins/vcalendar/vcal_folder.c:1632
 #, c-format
 msgid "Error %ld"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1813
+#: src/plugins/vcalendar/vcal_folder.c:1808
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13440,7 +13349,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1844
+#: src/plugins/vcalendar/vcal_folder.c:1839
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13448,110 +13357,110 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1875
-#: src/plugins/vcalendar/vcal_folder.c:1878
+#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1873
 #, c-format
 msgid "Could not create directory %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1918
+#: src/plugins/vcalendar/vcal_folder.c:1913
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1929
+#: src/plugins/vcalendar/vcal_folder.c:1924
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1930
+#: src/plugins/vcalendar/vcal_folder.c:1925
 msgid "new subscription"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1941
+#: src/plugins/vcalendar/vcal_folder.c:1936
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1981
 msgid "Subscribe to Webcal"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1981
 msgid "Enter the Webcal URL:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:1997
 msgid "Could not parse the URL."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:2030
+#: src/plugins/vcalendar/vcal_folder.c:2025
 msgid "Do you really want to unsubscribe?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:2031
+#: src/plugins/vcalendar/vcal_folder.c:2026
 msgid "Delete subscription"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:110
 msgid "accepted"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "tentatively accepted"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "declined"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:114
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "did not answer"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:144
 msgid "individual"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "group"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "resource"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "room"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:560
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Past"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:563
+#: src/plugins/vcalendar/vcal_manager.c:575
 msgid "Today"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:566
+#: src/plugins/vcalendar/vcal_manager.c:578
 msgid "Tomorrow"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:569
+#: src/plugins/vcalendar/vcal_manager.c:581
 msgid "This week"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:572
+#: src/plugins/vcalendar/vcal_manager.c:584
 msgid "Later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1260
 msgid "Accepted: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1262
 msgid "Declined: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1252
+#: src/plugins/vcalendar/vcal_manager.c:1264
 msgid "Tentatively Accepted: "
 msgstr ""
 
@@ -13933,661 +13842,692 @@ msgstr ""
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr ""
 
-#: src/pop.c:216 src/pop.c:243
+#: src/pop.c:266 src/pop.c:293
 msgid "POP protocol error\n"
 msgstr ""
 
-#: src/pop.c:289
+#: src/pop.c:339
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr ""
 
-#: src/pop.c:870
+#: src/pop.c:927
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr ""
 
-#: src/pop.c:886
+#: src/pop.c:943
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr ""
 
-#: src/pop.c:918
+#: src/pop.c:976
 msgid "mailbox is locked\n"
 msgstr ""
 
-#: src/pop.c:921
+#: src/pop.c:979
 msgid "Session timeout\n"
 msgstr ""
 
-#: src/pop.c:940
+#: src/pop.c:998
 msgid "command not supported\n"
 msgstr ""
 
-#: src/pop.c:945
+#: src/pop.c:1003
 msgid "error occurred on POP session\n"
 msgstr ""
 
-#: src/pop.c:1145
+#: src/pop.c:1215
 msgid "TOP command unsupported\n"
 msgstr ""
 
-#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2915
+#: src/prefs_account.c:415 src/prefs_account.c:1629 src/prefs_account.c:2980
 msgid "POP"
 msgstr ""
 
-#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2930
+#: src/prefs_account.c:416 src/prefs_account.c:1775 src/prefs_account.c:2995
 #: src/wizard.c:1516
 msgid "IMAP"
 msgstr ""
 
-#: src/prefs_account.c:397
+#: src/prefs_account.c:417
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:398 src/wizard.c:1517
+#: src/prefs_account.c:418 src/wizard.c:1517
 msgid "Local mbox file"
 msgstr ""
 
-#: src/prefs_account.c:399
+#: src/prefs_account.c:419
 msgid "None (SMTP only)"
 msgstr ""
 
-#: src/prefs_account.c:1202
+#: src/prefs_account.c:1234
 msgid "Name of account"
 msgstr ""
 
-#: src/prefs_account.c:1211
+#: src/prefs_account.c:1243
 msgid "Set as default"
 msgstr ""
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1251
 msgid "Personal information"
 msgstr ""
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1260
 msgid "Full name"
 msgstr ""
 
-#: src/prefs_account.c:1233
+#: src/prefs_account.c:1265
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1294 src/wizard.c:1540
+#: src/prefs_account.c:1326 src/wizard.c:1540
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1296 src/wizard.c:1541
+#: src/prefs_account.c:1328 src/wizard.c:1541
 msgid "Cancel"
 msgstr ""
 
-#: src/prefs_account.c:1313
+#: src/prefs_account.c:1345
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
 msgstr ""
 
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1374
 msgid "This server requires authentication"
 msgstr ""
 
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1380
 msgid "Authenticate on connect"
 msgstr ""
 
-#: src/prefs_account.c:1398
+#: src/prefs_account.c:1430
 msgid "News server"
 msgstr ""
 
-#: src/prefs_account.c:1403
+#: src/prefs_account.c:1435
 msgid "Server for receiving"
 msgstr ""
 
-#: src/prefs_account.c:1408
+#: src/prefs_account.c:1440
 msgid "Local mailbox"
 msgstr ""
 
-#: src/prefs_account.c:1413
+#: src/prefs_account.c:1445
 msgid "SMTP server (send)"
 msgstr ""
 
-#: src/prefs_account.c:1419
+#: src/prefs_account.c:1451
 msgid "Use mail command rather than SMTP server"
 msgstr ""
 
-#: src/prefs_account.c:1427
+#: src/prefs_account.c:1459
 msgid "command to send mails"
 msgstr ""
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1524
 #, c-format
 msgid "Account%d"
 msgstr ""
 
-#: src/prefs_account.c:1571
+#: src/prefs_account.c:1604
 msgid "Local"
 msgstr ""
 
-#: src/prefs_account.c:1577 src/prefs_account.c:1696
+#: src/prefs_account.c:1610 src/prefs_account.c:1732
 msgid "Default Inbox"
 msgstr ""
 
-#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1617 src/prefs_account.c:1623 src/prefs_account.c:1739
+#: src/prefs_account.c:1745
 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 
-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1632
 msgid "Authenticate before POP connection"
 msgstr ""
 
-#: src/prefs_account.c:1624 src/prefs_account.c:2224
+#: src/prefs_account.c:1657 src/prefs_account.c:2287
 msgid "Select"
 msgstr ""
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1668
 msgid "Remove messages on server when received"
 msgstr ""
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1679
 msgid "Remove after"
 msgstr ""
 
-#: src/prefs_account.c:1650 src/prefs_account.c:1660
+#: src/prefs_account.c:1686 src/prefs_account.c:1696
 msgid "0 days and 0 hours : remove immediately"
 msgstr ""
 
-#: src/prefs_account.c:1673
+#: src/prefs_account.c:1709
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1712
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 
-#: src/prefs_account.c:1715 src/prefs_account.c:2945
+#: src/prefs_account.c:1751 src/prefs_account.c:3010
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1758
 msgid "Maximum number of articles to download"
 msgstr ""
 
-#: src/prefs_account.c:1732
+#: src/prefs_account.c:1768
 msgid "unlimited if 0 is specified"
 msgstr ""
 
-#: src/prefs_account.c:1757
+#: src/prefs_account.c:1793
 msgid "Plain text"
 msgstr ""
 
-#: src/prefs_account.c:1771
+#: src/prefs_account.c:1814
 msgid "IMAP server directory"
 msgstr ""
 
-#: src/prefs_account.c:1775
+#: src/prefs_account.c:1818
 msgid "(usually empty)"
 msgstr ""
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1832
 msgid "Show subscribed folders only"
 msgstr ""
 
-#: src/prefs_account.c:1796
+#: src/prefs_account.c:1839
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:1841
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1805 src/prefs_receive.c:164
+#: src/prefs_account.c:1847
+msgid "Batch size"
+msgstr ""
+
+#: src/prefs_account.c:1861 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr ""
 
-#: src/prefs_account.c:1808
+#: src/prefs_account.c:1864
 msgid "Use global settings"
 msgstr ""
 
-#: src/prefs_account.c:1814 src/prefs_receive.c:171
+#: src/prefs_account.c:1870 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr ""
 
-#: src/prefs_account.c:1853
+#: src/prefs_account.c:1909
 msgid "Filter messages on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1925
 msgid "Allow filtering using plugins on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1873
+#: src/prefs_account.c:1929
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1963 src/prefs_customheader.c:208
+#: src/prefs_account.c:2020 src/prefs_customheader.c:207
 #: src/prefs_matcher.c:633 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr ""
 
-#: src/prefs_account.c:1965
+#: src/prefs_account.c:2022
 msgid "Generate Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1968
+#: src/prefs_account.c:2025
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1971
+#: src/prefs_account.c:2030
 msgid "Add user agent header"
 msgstr ""
 
-#: src/prefs_account.c:1978
+#: src/prefs_account.c:2037
 msgid "Add user-defined header"
 msgstr ""
 
-#: src/prefs_account.c:1993
+#: src/prefs_account.c:2052
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:2092
+#: src/prefs_account.c:2154
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account.c:2103
+#: src/prefs_account.c:2165
 msgid "Authenticate with POP before sending"
 msgstr ""
 
-#: src/prefs_account.c:2118
+#: src/prefs_account.c:2180
 msgid "POP authentication timeout"
 msgstr ""
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2261
 msgid "Authorization"
 msgstr "Authorisation"
 
-#: src/prefs_account.c:2215
+#: src/prefs_account.c:2278
 msgid "Select OAuth2 Email Service Provider"
 msgstr ""
 
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2319
 msgid "Client ID"
 msgstr ""
 
-#: src/prefs_account.c:2266
+#: src/prefs_account.c:2330
 msgid "Client secret"
 msgstr ""
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2355
 msgid "Obtain authorization code"
 msgstr "Obtain authorisation code"
 
-#: src/prefs_account.c:2295
+#: src/prefs_account.c:2359
 msgid "Open default browser with request"
 msgstr ""
 
-#: src/prefs_account.c:2302
+#: src/prefs_account.c:2366
 msgid "Copy link"
 msgstr ""
 
-#: src/prefs_account.c:2315
+#: src/prefs_account.c:2379
 msgid "Authorization code"
 msgstr "Authorisation code"
 
-#: src/prefs_account.c:2324
+#: src/prefs_account.c:2388
 msgid "Paste complete URL from browser or the provided authorization token"
 msgstr "Paste complete URL from browser or the provided authorisation token"
 
-#: src/prefs_account.c:2331
+#: src/prefs_account.c:2395
 msgid "Complete authorization"
 msgstr "Complete authorisation"
 
-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2399
 msgid "Authorize"
 msgstr "Authorise"
 
-#: src/prefs_account.c:2421 src/prefs_account.c:2467
+#: src/prefs_account.c:2486 src/prefs_account.c:2532
 msgid "Signature"
 msgstr ""
 
-#: src/prefs_account.c:2424
+#: src/prefs_account.c:2489
 msgid "Automatically insert signature"
 msgstr ""
 
-#: src/prefs_account.c:2429
+#: src/prefs_account.c:2494
 msgid "Signature separator"
 msgstr ""
 
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2519
 msgid "Command output"
 msgstr ""
 
-#: src/prefs_account.c:2487
+#: src/prefs_account.c:2552
 msgid "Automatically set the following addresses"
 msgstr ""
 
-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2601
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2546 src/prefs_folder_item.c:1162
+#: src/prefs_account.c:2611 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:1193
+#: src/prefs_account.c:2623 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:4116
+#: src/prefs_account.c:2708 src/prefs_account.c:4200
 #: 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:1620 src/prefs_quote.c:134
-#: src/toolbar.c:500
+#: src/prefs_account.c:2723 src/prefs_folder_item.c:1620 src/prefs_quote.c:134
+#: src/toolbar.c:499
 msgid "Reply"
 msgstr ""
 
-#: src/prefs_account.c:2673 src/prefs_filtering_action.c:183
-#: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:505
+#: src/prefs_account.c:2738 src/prefs_filtering_action.c:183
+#: src/prefs_folder_item.c:1648 src/prefs_quote.c:149 src/toolbar.c:504
 msgid "Forward"
 msgstr ""
 
-#: src/prefs_account.c:2720
+#: src/prefs_account.c:2785
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2749 src/prefs_folder_item.c:1230
+#: src/prefs_account.c:2814 src/prefs_folder_item.c:1230
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2751 src/prefs_folder_item.c:1261
+#: src/prefs_account.c:2816 src/prefs_folder_item.c:1261
 msgid "Always encrypt messages"
 msgstr ""
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:2818
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:2821
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
-#: src/prefs_account.c:2759
+#: src/prefs_account.c:2824
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
-#: src/prefs_account.c:2761
+#: src/prefs_account.c:2826
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
-#: src/prefs_account.c:2919 src/prefs_account.c:2934 src/prefs_account.c:2948
+#: src/prefs_account.c:2984 src/prefs_account.c:2999 src/prefs_account.c:3013
 msgid "Don't use TLS"
 msgstr ""
 
-#: src/prefs_account.c:2922 src/prefs_account.c:2937 src/prefs_account.c:2957
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:2987 src/prefs_account.c:3002 src/prefs_account.c:3022
+#: src/prefs_account.c:3033
 msgid "Use TLS"
 msgstr ""
 
-#: src/prefs_account.c:2925 src/prefs_account.c:2940 src/prefs_account.c:2971
+#: src/prefs_account.c:2990 src/prefs_account.c:3005 src/prefs_account.c:3036
 msgid "Use STARTTLS command to start encrypted session"
 msgstr ""
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:3026
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3030
 msgid "Don't use TLS (but, if necessary, use STARTTLS)"
 msgstr ""
 
-#: src/prefs_account.c:2976
+#: src/prefs_account.c:3041
 msgid "Client certificates"
 msgstr ""
 
-#: src/prefs_account.c:2984
+#: src/prefs_account.c:3049
 msgid "Certificate for receiving"
 msgstr ""
 
-#: src/prefs_account.c:2989 src/prefs_account.c:2991 src/prefs_account.c:3017
-#: src/prefs_account.c:3019
+#: src/prefs_account.c:3054 src/prefs_account.c:3056 src/prefs_account.c:3082
+#: src/prefs_account.c:3084
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr ""
 
-#: src/prefs_account.c:3012
+#: src/prefs_account.c:3077
 msgid "Certificate for sending"
 msgstr ""
 
-#: src/prefs_account.c:3052
+#: src/prefs_account.c:3117
 msgid "Automatically accept valid TLS certificates"
 msgstr ""
 
-#: src/prefs_account.c:3055
+#: src/prefs_account.c:3120
 msgid "Use non-blocking TLS"
 msgstr ""
 
-#: src/prefs_account.c:3067
+#: src/prefs_account.c:3132
 msgid "Turn this off if you have TLS connection problems"
 msgstr ""
 
-#: src/prefs_account.c:3159 src/prefs_proxy.c:75
+#: src/prefs_account.c:3224 src/prefs_proxy.c:75
 msgid "Use proxy server"
 msgstr ""
 
-#: src/prefs_account.c:3168
+#: src/prefs_account.c:3233
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr ""
 
-#: src/prefs_account.c:3170
+#: src/prefs_account.c:3235
 msgid "Use global proxy server settings"
 msgstr ""
 
-#: src/prefs_account.c:3207 src/prefs_proxy.c:117 src/wizard.c:1115
+#: src/prefs_account.c:3272 src/prefs_proxy.c:117 src/wizard.c:1115
 msgid "Use authentication"
 msgstr ""
 
-#: src/prefs_account.c:3212 src/prefs_proxy.c:125
+#: src/prefs_account.c:3277 src/prefs_proxy.c:125
 msgid "Username"
 msgstr ""
 
-#: src/prefs_account.c:3241
+#: src/prefs_account.c:3306
 msgid "Use proxy server for sending"
 msgstr ""
 
-#: src/prefs_account.c:3243
+#: src/prefs_account.c:3308
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
 msgstr ""
 
-#: src/prefs_account.c:3354
+#: src/prefs_account.c:3419
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3426
 msgid "POP port"
 msgstr ""
 
-#: src/prefs_account.c:3368
+#: src/prefs_account.c:3433
 msgid "IMAP port"
 msgstr ""
 
-#: src/prefs_account.c:3375
+#: src/prefs_account.c:3440
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:3381
+#: src/prefs_account.c:3446
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:3384
+#: src/prefs_account.c:3449
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:3398
+#: src/prefs_account.c:3463
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:3407
+#: src/prefs_account.c:3472
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
-#: src/prefs_account.c:3456
+#: src/prefs_account.c:3521
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:3458
+#: src/prefs_account.c:3523
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:3460
+#: src/prefs_account.c:3525
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:3462
+#: src/prefs_account.c:3527
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:3519
+#: src/prefs_account.c:3584
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3523
+#: src/prefs_account.c:3588
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3531
+#: src/prefs_account.c:3596
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3536
+#: src/prefs_account.c:3601
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3541
+#: src/prefs_account.c:3606
 msgid "POP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3561
+#: src/prefs_account.c:3626
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:3567
+#: src/prefs_account.c:3632
 msgid "IMAP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3572
+#: src/prefs_account.c:3637
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3578
+#: src/prefs_account.c:3643
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3584
+#: src/prefs_account.c:3649
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3594
+#: src/prefs_account.c:3659
 msgid "User ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3601
+#: src/prefs_account.c:3666
 msgid "Password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3636
+#: src/prefs_account.c:3703
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3641
+#: src/prefs_account.c:3708
 msgid "SMTP password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3733
+#: src/prefs_account.c:3804
 msgid "domain is not specified."
 msgstr ""
 
-#: src/prefs_account.c:3738
+#: src/prefs_account.c:3809
 msgid "sent folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3743
+#: src/prefs_account.c:3814
 msgid "queue folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3748
+#: src/prefs_account.c:3819
 msgid "draft folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3753
+#: src/prefs_account.c:3824
 msgid "trash folder is not selected."
 msgstr "wastebin folder is not selected."
 
-#: src/prefs_account.c:4062
+#: src/prefs_account.c:4144
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:4098
+#: src/prefs_account.c:4162
+msgctxt "Preferences menu item"
+msgid "Send"
+msgstr ""
+
+#: src/prefs_account.c:4181
 msgid "OAuth2"
 msgstr ""
 
-#: src/prefs_account.c:4134 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
+#: src/prefs_account.c:4218 src/prefs_folder_item.c:1973 src/prefs_quote.c:238
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_account.c:4152
+#: src/prefs_account.c:4236
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:4272
+#: src/prefs_account.c:4338 src/prefs_proxy.c:237
+msgid "Proxy"
+msgstr ""
+
+#: src/prefs_account.c:4356
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:4632
+#: src/prefs_account.c:4717
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:4634
+#: src/prefs_account.c:4719
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:4746 src/wizard.c:1406
+#: src/prefs_account.c:4831 src/wizard.c:1406
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:4831
+#: src/prefs_account.c:4916
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:4849 src/prefs_account.c:4866 src/wizard.c:1063
+#: src/prefs_account.c:4934 src/prefs_account.c:4951 src/wizard.c:1063
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4962
+#: src/prefs_account.c:5047
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:5282
+#: src/prefs_account.c:5391
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
 
+#: src/prefs_account.c:6171
+#, fuzzy
+msgid "Authorisation complete"
+msgstr "Authorisation code"
+
+#: src/prefs_account.c:6172
+msgid "Your OAuth2 authorisation code has been received by Claws Mail"
+msgstr ""
+
+#: src/prefs_account.c:6175
+#, fuzzy
+msgid "Authorisation NOT completed"
+msgstr "Authorisation code"
+
+#: src/prefs_account.c:6176
+msgid "Your OAuth2 authorisation code was not received by Claws Mail"
+msgstr ""
+
 #: src/prefs_actions.c:226
 msgid "Actions configuration"
 msgstr ""
@@ -14620,7 +14560,7 @@ msgstr ""
 msgid "Delete the selected action from the list"
 msgstr ""
 
-#: src/prefs_actions.c:350 src/prefs_filtering.c:485 src/prefs_template.c:330
+#: src/prefs_actions.c:350 src/prefs_filtering.c:485 src/prefs_template.c:329
 msgid "Clear all the input fields in the dialog"
 msgstr "Clear all the input fields in the dialogue"
 
@@ -14628,7 +14568,7 @@ msgstr "Clear all the input fields in the dialogue"
 msgid "Show information on configuring actions"
 msgstr ""
 
-#: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:356
+#: src/prefs_actions.c:383 src/prefs_filtering.c:510 src/prefs_template.c:355
 msgid "_Top"
 msgstr ""
 
@@ -14644,7 +14584,7 @@ msgstr ""
 msgid "Move selected action down"
 msgstr ""
 
-#: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:384
+#: src/prefs_actions.c:411 src/prefs_filtering.c:558 src/prefs_template.c:383
 msgid "_Bottom"
 msgstr ""
 
@@ -14655,7 +14595,7 @@ msgstr ""
 #: 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
+#: src/prefs_template.c:464
 msgid "(New)"
 msgstr ""
 
@@ -14708,20 +14648,20 @@ msgid "Do you really want to delete all the actions?"
 msgstr ""
 
 #: 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
+#: src/prefs_filtering.c:1514 src/prefs_matcher.c:2165 src/prefs_template.c:564
+#: src/prefs_template.c:589
 msgid "Entry not saved"
 msgstr ""
 
 #: 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
+#: src/prefs_filtering.c:1515 src/prefs_template.c:565 src/prefs_template.c:590
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 
 #: 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
+#: src/prefs_filtering.c:1516 src/prefs_matcher.c:2168 src/prefs_template.c:566
+#: src/prefs_template.c:591 src/prefs_template.c:596
 msgid "_Continue editing"
 msgstr ""
 
@@ -14814,7 +14754,7 @@ msgstr ""
 msgid "for a literal %"
 msgstr ""
 
-#: src/prefs_actions.c:1019 src/prefs_themes.c:1191
+#: src/prefs_actions.c:1019 src/prefs_themes.c:1170
 msgid "Actions"
 msgstr ""
 
@@ -14825,19 +14765,19 @@ msgid ""
 msgstr ""
 
 #: src/prefs_actions.c:1107 src/prefs_filtering.c:1691
-#: src/prefs_template.c:1107
+#: src/prefs_template.c:1106
 msgid "D_uplicate"
 msgstr ""
 
-#: src/prefs_actions.c:1225
+#: src/prefs_actions.c:1224
 msgid "Current actions"
 msgstr ""
 
-#: src/prefs_actions.c:1312
+#: src/prefs_actions.c:1311
 msgid "Entry was modified"
 msgstr ""
 
-#: src/prefs_actions.c:1313
+#: src/prefs_actions.c:1312
 msgid ""
 "Opening the filter action dialog will clear current modifications of the "
 "command-line."
@@ -14845,7 +14785,7 @@ 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_actions.c:1323 src/prefs_filtering.c:1062
 #: src/prefs_filtering.c:1120
 msgid "Action string is not valid."
 msgstr ""
@@ -14854,17 +14794,17 @@ msgstr ""
 msgid "Hello,\\n"
 msgstr ""
 
-#: src/prefs_common.c:316
+#: src/prefs_common.c:317
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr ""
 
-#: src/prefs_common.c:322 src/prefs_quote.c:85
+#: src/prefs_common.c:323 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"
 msgstr ""
 
-#: src/prefs_common.c:457
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -14909,11 +14849,7 @@ msgid "Undo level"
 msgstr ""
 
 #: src/prefs_compose_writing.c:194
-msgid "Warn when inserting a file larger than"
-msgstr ""
-
-#: src/prefs_compose_writing.c:205
-msgid "KiB into message body"
+msgid "Warn when inserting a file into the message body which is larger than"
 msgstr ""
 
 #: src/prefs_compose_writing.c:211
@@ -14949,11 +14885,11 @@ msgstr ""
 msgid "Ask"
 msgstr ""
 
-#: src/prefs_compose_writing.c:240 src/toolbar.c:533
+#: src/prefs_compose_writing.c:240 src/toolbar.c:532
 msgid "Insert"
 msgstr ""
 
-#: src/prefs_compose_writing.c:241 src/toolbar.c:534
+#: src/prefs_compose_writing.c:241 src/toolbar.c:533
 msgid "Attach"
 msgstr ""
 
@@ -14961,97 +14897,101 @@ msgstr ""
 msgid "Writing"
 msgstr ""
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:182
 msgid "Custom header configuration"
 msgstr ""
 
-#: src/prefs_customheader.c:494 src/prefs_display_header.c:588
+#: src/prefs_customheader.c:493 src/prefs_display_header.c:587
 #: src/prefs_matcher.c:1634 src/prefs_matcher.c:1649
 msgid "Header name is not set."
 msgstr ""
 
-#: src/prefs_customheader.c:504
+#: src/prefs_customheader.c:503
+msgid "A colon (:) is not allowed in a custom header."
+msgstr ""
+
+#: src/prefs_customheader.c:508
 msgid "This Header name is not allowed as a custom header."
 msgstr ""
 
-#: src/prefs_customheader.c:551
+#: src/prefs_customheader.c:553
 msgid "Choose a PNG file"
 msgstr ""
 
-#: src/prefs_customheader.c:553
+#: src/prefs_customheader.c:555
 msgid "Choose an XBM file"
 msgstr ""
 
-#: src/prefs_customheader.c:555
+#: src/prefs_customheader.c:557
 msgid "Choose a text file"
 msgstr ""
 
-#: src/prefs_customheader.c:568
+#: src/prefs_customheader.c:570
 msgid "This file isn't an image."
 msgstr ""
 
-#: src/prefs_customheader.c:573
+#: src/prefs_customheader.c:575
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr ""
 
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:581
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr ""
 
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:586
 msgid "The image isn't in the correct format (PNG)."
 msgstr ""
 
-#: src/prefs_customheader.c:593
+#: src/prefs_customheader.c:595
 msgid "The image isn't in the correct format (XBM)."
 msgstr ""
 
-#: src/prefs_customheader.c:602
+#: src/prefs_customheader.c:604
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 
-#: src/prefs_customheader.c:608
+#: src/prefs_customheader.c:610
 #, c-format
 msgid "Compface error: %s"
 msgstr ""
 
-#: src/prefs_customheader.c:661
+#: src/prefs_customheader.c:663
 msgid "This file contains newlines."
 msgstr ""
 
-#: src/prefs_customheader.c:691
+#: src/prefs_customheader.c:693
 msgid "Delete header"
 msgstr ""
 
-#: src/prefs_customheader.c:692
+#: src/prefs_customheader.c:694
 msgid "Do you really want to delete this header?"
 msgstr ""
 
-#: src/prefs_customheader.c:866
+#: src/prefs_customheader.c:867
 msgid "Current custom headers"
 msgstr ""
 
-#: src/prefs_display_header.c:253
+#: src/prefs_display_header.c:252
 msgid "Displayed header configuration"
 msgstr ""
 
-#: src/prefs_display_header.c:277
+#: src/prefs_display_header.c:276
 msgid "Header name"
 msgstr ""
 
-#: src/prefs_display_header.c:312
+#: src/prefs_display_header.c:311
 msgid "Hidden headers"
 msgstr ""
 
-#: src/prefs_display_header.c:353
+#: src/prefs_display_header.c:352
 msgid "Displayed Headers"
 msgstr ""
 
-#: src/prefs_display_header.c:398
+#: src/prefs_display_header.c:397
 msgid "Show all unspecified headers"
 msgstr ""
 
-#: src/prefs_display_header.c:598
+#: src/prefs_display_header.c:597
 msgid "This header is already in the list."
 msgstr ""
 
@@ -15110,8 +15050,8 @@ msgstr ""
 msgid "Message flags"
 msgstr ""
 
-#: 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
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:708
+#: src/prefs_summary_column.c:77 src/toolbar.c:514
 msgid "Mark"
 msgstr ""
 
@@ -15132,11 +15072,11 @@ msgid "Mark as ham"
 msgstr ""
 
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
-#: src/toolbar.c:241 src/toolbar.c:509 src/toolbar.c:2510
+#: src/toolbar.c:240 src/toolbar.c:508 src/toolbar.c:2509
 msgid "Execute"
 msgstr ""
 
-#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:641
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:706
 msgid "Color label"
 msgstr "Colour label"
 
@@ -15151,7 +15091,7 @@ 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:646 src/prefs_summary_column.c:86
+#: src/prefs_summaries.c:711 src/prefs_summary_column.c:86
 #: src/summaryview.c:470
 msgid "Score"
 msgstr ""
@@ -15194,7 +15134,7 @@ msgstr ""
 msgid "Action configuration"
 msgstr ""
 
-#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1882
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1881
 #: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr ""
@@ -15284,7 +15224,7 @@ msgstr ""
 msgid "Color"
 msgstr "Colour"
 
-#: src/prefs_filtering_action.c:1477
+#: src/prefs_filtering_action.c:1476
 msgid "Current action list"
 msgstr ""
 
@@ -15398,7 +15338,7 @@ msgstr ""
 msgid "Move one page down"
 msgstr ""
 
-#: src/prefs_filtering.c:1850
+#: src/prefs_filtering.c:1849
 msgid "Enable"
 msgstr ""
 
@@ -15416,8 +15356,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr ""
 
-#: src/prefs_folder_column.c:300 src/prefs_summaries.c:384
-#: src/prefs_summaries.c:453 src/prefs_summary_column.c:314
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:424
+#: src/prefs_summaries.c:518 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr ""
 
@@ -15443,10 +15383,6 @@ msgstr ""
 msgid "Normal"
 msgstr ""
 
-#: src/prefs_folder_item.c:325
-msgid "Outbox"
-msgstr ""
-
 #: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr ""
@@ -15608,7 +15544,7 @@ msgstr ""
 msgid "Message Printing"
 msgstr ""
 
-#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:876
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:581 src/prefs_summaries.c:951
 #: src/prefs_themes.c:426
 msgid "Display"
 msgstr ""
@@ -15617,7 +15553,7 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs_gtk.c:910 src/toolbar.c:260 src/toolbar.c:528
+#: src/prefs_gtk.c:910 src/toolbar.c:259 src/toolbar.c:527
 msgid "Preferences"
 msgstr ""
 
@@ -15765,7 +15701,7 @@ msgstr ""
 msgid "Status messages for filtering/processing log"
 msgstr ""
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:143 src/prefs_other.c:785
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:143 src/prefs_other.c:698
 msgid "Other"
 msgstr ""
 
@@ -15849,11 +15785,11 @@ msgstr ""
 msgid "whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:402 src/summaryview.c:6551
+#: src/prefs_matcher.c:402 src/summaryview.c:6552
 msgid "Marked"
 msgstr ""
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6549
+#: src/prefs_matcher.c:403 src/summaryview.c:6550
 msgid "Deleted"
 msgstr ""
 
@@ -15861,12 +15797,12 @@ msgstr ""
 msgid "Replied"
 msgstr ""
 
-#: src/prefs_matcher.c:405 src/summaryview.c:6543
+#: src/prefs_matcher.c:405 src/summaryview.c:6544
 msgid "Forwarded"
 msgstr ""
 
-#: src/prefs_matcher.c:407 src/summaryview.c:6533 src/toolbar.c:526
-#: src/toolbar.c:1005 src/toolbar.c:2384
+#: src/prefs_matcher.c:407 src/summaryview.c:6534 src/toolbar.c:525
+#: src/toolbar.c:1004 src/toolbar.c:2383
 msgid "Spam"
 msgstr ""
 
@@ -15874,7 +15810,7 @@ msgstr ""
 msgid "Has attachment"
 msgstr ""
 
-#: src/prefs_matcher.c:409 src/summaryview.c:6569
+#: src/prefs_matcher.c:409 src/summaryview.c:6570
 msgid "Signed"
 msgstr ""
 
@@ -15981,7 +15917,7 @@ msgid ""
 msgstr ""
 
 #: src/prefs_matcher.c:715 src/prefs_matcher.c:1655 src/prefs_matcher.c:1670
-#: src/prefs_matcher.c:2583
+#: src/prefs_matcher.c:2582
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr ""
@@ -16138,7 +16074,7 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: src/prefs_matcher.c:2334
+#: src/prefs_matcher.c:2333
 msgid "Current condition rules"
 msgstr ""
 
@@ -16366,7 +16302,7 @@ msgstr "Pick colour for hunk lines"
 msgid "Hunk lines"
 msgstr ""
 
-#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:378
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:418
 msgid "Folder list"
 msgstr ""
 
@@ -16420,131 +16356,121 @@ msgstr "Pick colour for 'color %d'"
 msgid "Colors"
 msgstr "Colours"
 
-#: src/prefs_other.c:108
-msgid "Choose preset keyboard shortcuts"
-msgstr ""
-
-#: src/prefs_other.c:123
-msgid "Select preset:"
-msgstr ""
-
-#: src/prefs_other.c:138
-msgid ""
-"You can also modify each menu shortcut by pressing\n"
-"any key(s) when focusing the mouse pointer on the item."
-msgstr ""
-
-#: src/prefs_other.c:495
+#: src/prefs_other.c:397
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_other.c:498
+#: src/prefs_other.c:400
 msgid "On exit"
 msgstr ""
 
-#: src/prefs_other.c:501
+#: src/prefs_other.c:403
 msgid "Confirm on exit"
 msgstr ""
 
-#: src/prefs_other.c:508
+#: src/prefs_other.c:410
 msgid "Empty trash on exit"
 msgstr "Empty wastebin on exit"
 
-#: src/prefs_other.c:511
+#: src/prefs_other.c:413
 msgid "Warn if there are queued messages"
 msgstr ""
 
-#: src/prefs_other.c:513
+#: src/prefs_other.c:415
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:516
+#: src/prefs_other.c:418
 msgid "Enable keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:519
-msgid " Choose preset keyboard shortcuts... "
+#: src/prefs_other.c:425
+msgid "Select preset keyboard shortcuts:"
+msgstr ""
+
+#: src/prefs_other.c:430
+msgid "Current"
 msgstr ""
 
-#: src/prefs_other.c:529
+#: src/prefs_other.c:439
 msgid "Metadata handling"
 msgstr ""
 
-#: src/prefs_other.c:530
+#: src/prefs_other.c:440
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
 msgstr ""
 
-#: src/prefs_other.c:535
+#: src/prefs_other.c:445
 msgid "Safer"
 msgstr ""
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:447
 msgid "Faster"
 msgstr ""
 
-#: src/prefs_other.c:555
+#: src/prefs_other.c:465
 msgid "Socket I/O timeout"
 msgstr ""
 
-#: src/prefs_other.c:576
+#: src/prefs_other.c:486
 msgid "Translate header names"
 msgstr ""
 
-#: src/prefs_other.c:578
+#: src/prefs_other.c:488
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
 
-#: src/prefs_other.c:581
+#: src/prefs_other.c:491
 msgid "Ask before emptying trash"
 msgstr "Ask before emptying wastebin"
 
-#: src/prefs_other.c:583
+#: src/prefs_other.c:493
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 
-#: src/prefs_other.c:588
+#: src/prefs_other.c:498
 msgid "Use secure file deletion if possible"
 msgstr ""
 
-#: src/prefs_other.c:592
+#: src/prefs_other.c:502
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
 msgstr ""
 
-#: src/prefs_other.c:597
+#: src/prefs_other.c:507
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
 msgstr ""
 
-#: src/prefs_other.c:601
+#: src/prefs_other.c:511
 msgid "Synchronise offline folders as soon as possible"
 msgstr ""
 
-#: src/prefs_other.c:604
+#: src/prefs_other.c:514
 msgid "Primary passphrase"
 msgstr ""
 
-#: src/prefs_other.c:607
+#: src/prefs_other.c:517
 msgid "Use a primary passphrase"
 msgstr ""
 
-#: src/prefs_other.c:610
+#: src/prefs_other.c:520
 msgid ""
 "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
+#: src/prefs_other.c:525
 msgid "Change primary passphrase"
 msgstr ""
 
-#: src/prefs_other.c:786
+#: src/prefs_other.c:699
 msgid "Miscellaneous"
 msgstr ""
 
@@ -16585,8 +16511,8 @@ msgid "Close receive dialog when finished"
 msgstr "Close receive dialogue when finished"
 
 #: src/prefs_receive.c:244
-msgid "Don't popup error dialog on receive error"
-msgstr "Don't popup error dialogue on receive error"
+msgid "Don't show error dialog on receive error"
+msgstr "Don't show error dialogue on receive error"
 
 #: src/prefs_receive.c:247
 msgid "After receiving new mail"
@@ -16785,8 +16711,8 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
-#: src/send_message.c:533
+#: src/prefs_send.c:412 src/send_message.c:527 src/send_message.c:531
+#: src/send_message.c:536
 msgid "Sending"
 msgstr ""
 
@@ -16838,264 +16764,268 @@ msgstr "Pick colour for misspelled word. Use black to underline"
 msgid "Spell Checking"
 msgstr ""
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:203
 msgid "the abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:204
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:205
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:206
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:207
 msgid "the preferred date and time for the current locale"
 msgstr ""
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:208
 msgid "the century number (year/100)"
 msgstr ""
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:209
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:210
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:211
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:212
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:213
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:214
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:215
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:216
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:217
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:179
+#: src/prefs_summaries.c:218
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_summaries.c:180
+#: src/prefs_summaries.c:219
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:220
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:182
+#: src/prefs_summaries.c:221
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_summaries.c:203 src/prefs_summaries.c:252
-#: src/prefs_summaries.c:488
+#: src/prefs_summaries.c:242 src/prefs_summaries.c:289
+#: src/prefs_summaries.c:553
 msgid "Date format"
 msgstr ""
 
-#: src/prefs_summaries.c:228
+#: src/prefs_summaries.c:265
 msgid "Specifier"
 msgstr ""
 
-#: src/prefs_summaries.c:270
+#: src/prefs_summaries.c:307
 msgid "Example"
 msgstr ""
 
-#: src/prefs_summaries.c:398
+#: src/prefs_summaries.c:438
 msgid "Display message count next to folder name"
 msgstr ""
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:448
 msgid "Unread messages"
 msgstr ""
 
-#: src/prefs_summaries.c:409
+#: src/prefs_summaries.c:449
 msgid "Unread and Total messages"
 msgstr ""
 
-#: src/prefs_summaries.c:415
+#: src/prefs_summaries.c:455
 msgid "Open last opened folder at start-up"
 msgstr ""
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:463
+msgid "Open selected folder at start-up"
+msgstr ""
+
+#: src/prefs_summaries.c:484
 msgid ""
 "Run processing rules before marking all messages in a folder as read or "
 "unread"
 msgstr ""
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:491
 msgid "Abbreviate newsgroup names longer than"
 msgstr ""
 
-#: src/prefs_summaries.c:439
+#: src/prefs_summaries.c:504
 msgid "letters"
 msgstr ""
 
-#: src/prefs_summaries.c:447
+#: src/prefs_summaries.c:512
 msgid "Message list"
 msgstr ""
 
-#: src/prefs_summaries.c:464
+#: src/prefs_summaries.c:529
 msgid "Lock column headers"
 msgstr ""
 
-#: src/prefs_summaries.c:470
+#: src/prefs_summaries.c:535
 msgid "Displayed in From column"
 msgstr ""
 
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:546
 msgid "Name and Address"
 msgstr ""
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:572
 msgid "Date format help"
 msgstr ""
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:578
 msgid "Set message selection when entering a folder"
 msgstr ""
 
-#: src/prefs_summaries.c:522
+#: src/prefs_summaries.c:587
 msgid "Open message when selected"
 msgstr ""
 
-#: src/prefs_summaries.c:527
+#: src/prefs_summaries.c:592
 msgid "When opening a folder"
 msgstr ""
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:594
 msgid "When displaying search results"
 msgstr ""
 
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:596
 msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 
-#: src/prefs_summaries.c:533
+#: src/prefs_summaries.c:598
 msgid "When deleting or moving messages"
 msgstr ""
 
-#: src/prefs_summaries.c:535
+#: src/prefs_summaries.c:600
 msgid "When using directional keys"
 msgstr ""
 
-#: src/prefs_summaries.c:537
+#: src/prefs_summaries.c:602
 msgid "Mark message as read"
 msgstr ""
 
-#: src/prefs_summaries.c:540
+#: src/prefs_summaries.c:605
 msgid "when selected, after"
 msgstr ""
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:624
 msgid "only when opened in a new window, or replied to"
 msgstr ""
 
-#: src/prefs_summaries.c:569
+#: src/prefs_summaries.c:634
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Show \"no unread (or new) message\" dialogue"
 
-#: src/prefs_summaries.c:579
+#: src/prefs_summaries.c:644
 msgid "Assume 'Yes'"
 msgstr ""
 
-#: src/prefs_summaries.c:580
+#: src/prefs_summaries.c:645
 msgid "Assume 'No'"
 msgstr ""
 
-#: src/prefs_summaries.c:586
+#: src/prefs_summaries.c:651
 msgid "Display sender using address book"
 msgstr ""
 
-#: src/prefs_summaries.c:590
+#: src/prefs_summaries.c:655
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 
-#: src/prefs_summaries.c:594
+#: src/prefs_summaries.c:659
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_summaries.c:596
+#: src/prefs_summaries.c:661
 msgid ""
 "When unchecked moving, copying and deleting of messages is deferred until "
 "you use 'Tools/Execute'"
 msgstr ""
 
-#: src/prefs_summaries.c:601
+#: src/prefs_summaries.c:666
 msgid "Confirm when marking all messages as read or unread"
 msgstr ""
 
-#: src/prefs_summaries.c:604
+#: src/prefs_summaries.c:669
 msgid "Confirm when changing color labels"
 msgstr "Confirm when changing colour labels"
 
-#: src/prefs_summaries.c:608
+#: src/prefs_summaries.c:673
 msgid "Show tooltips"
 msgstr ""
 
-#: src/prefs_summaries.c:618 src/quote_fmt.c:541
+#: src/prefs_summaries.c:683 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr ""
 
-#: src/prefs_summaries.c:620
+#: src/prefs_summaries.c:685
 msgid "New folders"
 msgstr ""
 
-#: src/prefs_summaries.c:626
+#: src/prefs_summaries.c:691
 msgid "Sort by"
 msgstr ""
 
-#: src/prefs_summaries.c:634 src/prefs_summary_column.c:85
+#: src/prefs_summaries.c:699 src/prefs_summary_column.c:85
 msgid "Number"
 msgstr ""
 
-#: src/prefs_summaries.c:637
+#: src/prefs_summaries.c:702
 msgid "Thread date"
 msgstr ""
 
-#: src/prefs_summaries.c:648
+#: src/prefs_summaries.c:713
 msgid "Don't sort"
 msgstr ""
 
-#: src/prefs_summaries.c:663
+#: src/prefs_summaries.c:728
 msgid "Thread view"
 msgstr ""
 
-#: src/prefs_summaries.c:666
+#: src/prefs_summaries.c:731
 msgid "Collapse all threads"
 msgstr ""
 
-#: src/prefs_summaries.c:672
+#: src/prefs_summaries.c:737
 msgid "Hide read messages"
 msgstr ""
 
-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:952
 msgid "Summaries"
 msgstr ""
 
@@ -17109,162 +17039,162 @@ msgid ""
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 
-#: src/prefs_summary_open.c:109
+#: src/prefs_summary_open.c:108
 msgid "oldest marked email"
 msgstr ""
 
-#: src/prefs_summary_open.c:110
+#: src/prefs_summary_open.c:109
 msgid "oldest new email"
 msgstr ""
 
-#: src/prefs_summary_open.c:111
+#: src/prefs_summary_open.c:110
 msgid "oldest unread email"
 msgstr ""
 
-#: src/prefs_summary_open.c:112
+#: src/prefs_summary_open.c:111
 msgid "last opened email"
 msgstr ""
 
-#: src/prefs_summary_open.c:113
+#: src/prefs_summary_open.c:112
 msgid "newest email in the list"
 msgstr ""
 
-#: src/prefs_summary_open.c:115
+#: src/prefs_summary_open.c:114
 msgid "oldest email in the list"
 msgstr ""
 
-#: src/prefs_summary_open.c:116
+#: src/prefs_summary_open.c:115
 msgid "newest marked email"
 msgstr ""
 
-#: src/prefs_summary_open.c:117
+#: src/prefs_summary_open.c:116
 msgid "newest new email"
 msgstr ""
 
-#: src/prefs_summary_open.c:118
+#: src/prefs_summary_open.c:117
 msgid "newest unread email"
 msgstr ""
 
-#: src/prefs_summary_open.c:188
+#: src/prefs_summary_open.c:187
 msgid "Message selection when entering a folder"
 msgstr ""
 
-#: src/prefs_summary_open.c:233
+#: src/prefs_summary_open.c:232
 msgid "Available selections"
 msgstr ""
 
-#: src/prefs_summary_open.c:268
+#: src/prefs_summary_open.c:267
 msgid "Current selections"
 msgstr ""
 
-#: src/prefs_template.c:79
+#: src/prefs_template.c:78
 msgid "This name is used as the Menu item"
 msgstr ""
 
-#: src/prefs_template.c:81
+#: src/prefs_template.c:80
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr ""
 
-#: src/prefs_template.c:305
+#: src/prefs_template.c:304
 msgid "Append the new template above to the list"
 msgstr ""
 
-#: src/prefs_template.c:314
+#: src/prefs_template.c:313
 msgid "Replace the selected template in list with the template above"
 msgstr ""
 
-#: src/prefs_template.c:322
+#: src/prefs_template.c:321
 msgid "Delete the selected template from the list"
 msgstr ""
 
-#: src/prefs_template.c:338
+#: src/prefs_template.c:337
 msgid "Show information on configuring templates"
 msgstr ""
 
-#: src/prefs_template.c:362
+#: src/prefs_template.c:361
 msgid "Move the selected template to the top"
 msgstr ""
 
-#: src/prefs_template.c:372
+#: src/prefs_template.c:371
 msgid "Move the selected template up"
 msgstr ""
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:379
 msgid "Move the selected template down"
 msgstr ""
 
-#: src/prefs_template.c:390
+#: src/prefs_template.c:389
 msgid "Move the selected template to the bottom"
 msgstr ""
 
-#: src/prefs_template.c:406
+#: src/prefs_template.c:405
 msgid "Template configuration"
 msgstr ""
 
-#: src/prefs_template.c:595
+#: src/prefs_template.c:594
 msgid "Templates list not saved"
 msgstr ""
 
-#: src/prefs_template.c:596
+#: src/prefs_template.c:595
 msgid "The templates list has been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_template.c:753
+#: src/prefs_template.c:752
 msgid "The template's name is not set."
 msgstr ""
 
-#: src/prefs_template.c:796
+#: src/prefs_template.c:795
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:802
+#: src/prefs_template.c:801
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:808
+#: src/prefs_template.c:807
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:814
+#: src/prefs_template.c:813
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:820
+#: src/prefs_template.c:819
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:826
+#: src/prefs_template.c:825
 msgid "The \"Subject\" field of the template is invalid."
 msgstr ""
 
-#: src/prefs_template.c:897
+#: src/prefs_template.c:896
 msgid "Delete template"
 msgstr ""
 
-#: src/prefs_template.c:898
+#: src/prefs_template.c:897
 msgid "Do you really want to delete this template?"
 msgstr ""
 
-#: src/prefs_template.c:910
+#: src/prefs_template.c:909
 msgid "Delete all templates"
 msgstr ""
 
-#: src/prefs_template.c:911
+#: src/prefs_template.c:910
 msgid "Do you really want to delete all the templates?"
 msgstr ""
 
-#: src/prefs_template.c:1225
+#: src/prefs_template.c:1223
 msgid "Current templates"
 msgstr ""
 
-#: src/prefs_template.c:1253
+#: src/prefs_template.c:1251
 msgid "Template"
 msgstr ""
 
-#: src/prefs_themes.c:405 src/prefs_themes.c:939
+#: src/prefs_themes.c:405 src/prefs_themes.c:918
 msgid "Default internal theme"
 msgstr ""
 
@@ -17272,59 +17202,50 @@ msgstr ""
 msgid "Themes"
 msgstr ""
 
-#: src/prefs_themes.c:504
-#, c-format
-msgid "Remove system theme '%s'"
-msgstr ""
-
-#: src/prefs_themes.c:506
+#: src/prefs_themes.c:503
 #, c-format
 msgid "Remove theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:511
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr ""
 
-#: src/prefs_themes.c:521
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
 "while removing theme."
 msgstr ""
 
-#: src/prefs_themes.c:525
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr ""
 
-#: src/prefs_themes.c:528
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr ""
 
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr ""
 
-#: src/prefs_themes.c:563
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:566
+#: src/prefs_themes.c:562
 msgid ""
 "This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 
-#: src/prefs_themes.c:576
-msgid "Do you want to install theme for all users?"
-msgstr ""
-
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:573
 msgid "Theme exists"
 msgstr ""
 
-#: src/prefs_themes.c:597
+#: src/prefs_themes.c:574
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17332,103 +17253,103 @@ msgid ""
 "Do you want to replace it?"
 msgstr ""
 
-#: src/prefs_themes.c:604
+#: src/prefs_themes.c:581
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr ""
 
-#: src/prefs_themes.c:613
+#: src/prefs_themes.c:590
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr ""
 
-#: src/prefs_themes.c:627
+#: src/prefs_themes.c:604
 msgid "Theme installed successfully."
 msgstr ""
 
-#: src/prefs_themes.c:634
+#: src/prefs_themes.c:611
 msgid "Failed installing theme"
 msgstr ""
 
-#: src/prefs_themes.c:637
+#: src/prefs_themes.c:614
 #, c-format
 msgid ""
 "File %s failed\n"
 "while installing theme."
 msgstr ""
 
-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:664
 msgid "View all theme icons"
 msgstr ""
 
-#: src/prefs_themes.c:901
+#: src/prefs_themes.c:880
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 
-#: src/prefs_themes.c:942
+#: src/prefs_themes.c:921
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr ""
 
-#: src/prefs_themes.c:948
+#: src/prefs_themes.c:927
 msgid "No info file available for this theme"
 msgstr ""
 
-#: src/prefs_themes.c:966
+#: src/prefs_themes.c:945
 msgid "Error: couldn't get theme status"
 msgstr ""
 
-#: src/prefs_themes.c:996
+#: src/prefs_themes.c:975
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr ""
 
-#: src/prefs_themes.c:1055
+#: src/prefs_themes.c:1034
 msgid "Selector"
 msgstr ""
 
-#: src/prefs_themes.c:1066
+#: src/prefs_themes.c:1045
 msgid "Install new..."
 msgstr ""
 
-#: src/prefs_themes.c:1071
+#: src/prefs_themes.c:1050
 msgid "Get more..."
 msgstr ""
 
-#: src/prefs_themes.c:1083
+#: src/prefs_themes.c:1062
 msgid "Information"
 msgstr ""
 
-#: src/prefs_themes.c:1098
+#: src/prefs_themes.c:1077
 msgid "Author"
 msgstr ""
 
-#: src/prefs_themes.c:1104
+#: src/prefs_themes.c:1083
 msgid "URL"
 msgstr ""
 
-#: src/prefs_themes.c:1142
+#: src/prefs_themes.c:1121
 msgid "Preview"
 msgstr ""
 
-#: src/prefs_themes.c:1205
+#: src/prefs_themes.c:1184
 msgid "View all"
 msgstr ""
 
-#: src/prefs_themes.c:1210
+#: src/prefs_themes.c:1189
 msgid "SVG rendering"
 msgstr ""
 
-#: src/prefs_themes.c:1217
+#: src/prefs_themes.c:1196
 msgid "Enable alpha channel"
 msgstr ""
 
-#: src/prefs_themes.c:1218
+#: src/prefs_themes.c:1197
 msgid "Force scaling"
 msgstr ""
 
-#: src/prefs_themes.c:1224
+#: src/prefs_themes.c:1203
 msgid "Pixels per inch (PPI)"
 msgstr ""
 
@@ -17462,7 +17383,7 @@ msgstr ""
 msgid "User Action"
 msgstr ""
 
-#: src/prefs_toolbar.c:925 src/toolbar.c:283
+#: src/prefs_toolbar.c:925 src/toolbar.c:282
 msgid "Separator"
 msgstr ""
 
@@ -17502,7 +17423,7 @@ msgstr ""
 msgid "Mapped event"
 msgstr ""
 
-#: src/prefs_toolbar.c:1677
+#: src/prefs_toolbar.c:1675
 msgid "Toolbar item icon"
 msgstr ""
 
@@ -17530,44 +17451,44 @@ msgstr ""
 msgid "Wrapping"
 msgstr ""
 
-#: src/printing.c:432
+#: src/printing.c:435
 msgid "Print preview"
 msgstr ""
 
-#: src/printing.c:476
+#: src/printing.c:479
 msgid "First page"
 msgstr ""
 
-#: src/printing.c:486
+#: src/printing.c:489
 msgid "Last page"
 msgstr ""
 
-#: src/printing.c:492
+#: src/printing.c:495
 msgid "Zoom 100%"
 msgstr ""
 
-#: src/printing.c:494
+#: src/printing.c:497
 msgid "Zoom fit"
 msgstr ""
 
-#: src/printing.c:496
+#: src/printing.c:499
 msgid "Zoom in"
 msgstr ""
 
-#: src/printing.c:498
+#: src/printing.c:501
 msgid "Zoom out"
 msgstr ""
 
-#: src/printing.c:677
+#: src/printing.c:688
 #, c-format
 msgid "Page %d"
 msgstr ""
 
-#: src/privacy.c:289 src/privacy.c:293
+#: src/privacy.c:287 src/privacy.c:291
 msgid "No information available"
 msgstr ""
 
-#: src/privacy.c:507
+#: src/privacy.c:505
 msgid "No recipient keys defined."
 msgstr ""
 
@@ -17575,7 +17496,7 @@ msgstr ""
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
-#: src/procmime.c:2836
+#: src/procmime.c:2798
 msgid "Could not decode part"
 msgstr ""
 
@@ -17894,106 +17815,94 @@ msgstr ""
 msgid "Enter variable"
 msgstr ""
 
-#: src/send_message.c:155
+#: src/send_message.c:157
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr ""
 
-#: src/send_message.c:169
+#: src/send_message.c:171
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr ""
 
-#: src/send_message.c:205
+#: src/send_message.c:207
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr ""
 
-#: src/send_message.c:357
+#: src/send_message.c:360
 msgid "Connecting"
 msgstr ""
 
-#: src/send_message.c:362
+#: src/send_message.c:365
 msgid "Doing POP before SMTP..."
 msgstr ""
 
-#: src/send_message.c:365
+#: src/send_message.c:368
 msgid "POP before SMTP"
 msgstr ""
 
-#: src/send_message.c:370
+#: src/send_message.c:373
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr ""
 
-#: src/send_message.c:443
+#: src/send_message.c:446
 msgid "Mail sent successfully."
 msgstr ""
 
-#: src/send_message.c:509
+#: src/send_message.c:512
 msgid "Sending HELO..."
 msgstr ""
 
-#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
+#: src/send_message.c:513 src/send_message.c:518 src/send_message.c:523
 msgid "Authenticating"
 msgstr ""
 
-#: src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:514 src/send_message.c:519
 msgid "Sending message..."
 msgstr ""
 
-#: src/send_message.c:514
+#: src/send_message.c:517
 msgid "Sending EHLO..."
 msgstr ""
 
-#: src/send_message.c:523
+#: src/send_message.c:526
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:527
+#: src/send_message.c:530
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:532
+#: src/send_message.c:535
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:536
+#: src/send_message.c:539
 msgid "Quitting..."
 msgstr ""
 
-#: src/send_message.c:565
+#: src/send_message.c:568
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr ""
 
-#: src/send_message.c:618
+#: src/send_message.c:621
 msgid "Sending message"
 msgstr ""
 
-#: src/send_message.c:687 src/send_message.c:707
+#: src/send_message.c:690 src/send_message.c:710
 msgid "Error occurred while sending the message."
 msgstr ""
 
-#: src/send_message.c:690
+#: src/send_message.c:693
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr ""
 
-#: src/setup.c:75
-msgid "Mailbox setting"
-msgstr ""
-
-#: src/setup.c:76
-msgid ""
-"First, you have to set the location of mailbox.\n"
-"You can use existing mailbox in MH format\n"
-"if you have the one.\n"
-"If you're not sure, just select OK."
-msgstr ""
-
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr ""
@@ -18007,15 +17916,15 @@ msgstr ""
 msgid "Expiry"
 msgstr ""
 
-#: src/ssl_manager.c:195
+#: src/ssl_manager.c:193
 msgid "Saved TLS certificates"
 msgstr ""
 
-#: src/ssl_manager.c:451
+#: src/ssl_manager.c:449
 msgid "Delete certificate"
 msgstr ""
 
-#: src/ssl_manager.c:452
+#: src/ssl_manager.c:450
 msgid "Do you really want to delete this certificate?"
 msgstr ""
 
@@ -18043,7 +17952,7 @@ msgstr ""
 msgid "Find _all"
 msgstr ""
 
-#: src/summary_search.c:696 src/summaryview.c:1138 src/summaryview.c:1402
+#: src/summary_search.c:696 src/summaryview.c:1141 src/summaryview.c:1405
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
@@ -18080,70 +17989,64 @@ msgstr ""
 msgid "Toggle multiple selection"
 msgstr ""
 
-#: src/summaryview.c:1329
+#: src/summaryview.c:1332
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:1330
+#: src/summaryview.c:1333
 msgid "Some marks are left. Process them?"
 msgstr ""
 
-#: src/summaryview.c:1381
+#: src/summaryview.c:1384
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 
-#: src/summaryview.c:1935 src/summaryview.c:1984
+#: src/summaryview.c:1940 src/summaryview.c:1988
 msgid "No more unread messages"
 msgstr ""
 
-#: src/summaryview.c:1936
+#: src/summaryview.c:1941
 msgid "No unread message found. Search from the end?"
 msgstr ""
 
-#: 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:1961
+#: src/summaryview.c:1965
 msgid "No unread messages."
 msgstr ""
 
-#: src/summaryview.c:1985
+#: src/summaryview.c:1989
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2022 src/summaryview.c:2071
+#: src/summaryview.c:2025 src/summaryview.c:2073
 msgid "No more new messages"
 msgstr ""
 
-#: src/summaryview.c:2023
+#: src/summaryview.c:2026
 msgid "No new message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2048
+#: src/summaryview.c:2050
 msgid "No new messages."
 msgstr ""
 
-#: src/summaryview.c:2072
+#: src/summaryview.c:2074
 msgid "No new message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2106 src/summaryview.c:2140
+#: src/summaryview.c:2107 src/summaryview.c:2141
 msgid "No more marked messages"
 msgstr ""
 
-#: src/summaryview.c:2107
+#: src/summaryview.c:2108
 msgid "No marked message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2117
+#: src/summaryview.c:2118
 msgid "No marked messages."
 msgstr ""
 
-#: src/summaryview.c:2141
+#: src/summaryview.c:2142
 msgid "No marked message found. Go to next folder?"
 msgstr ""
 
@@ -18177,10 +18080,6 @@ msgstr ""
 msgid "%s%d moved"
 msgstr ""
 
-#: src/summaryview.c:2723 src/summaryview.c:2730
-msgid ", "
-msgstr ""
-
 #: src/summaryview.c:2728
 #, c-format
 msgid "%s%d copied"
@@ -18242,6 +18141,11 @@ msgstr ""
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr ""
 
+#: src/summaryview.c:2884
+msgctxt "Column Header"
+msgid "_Mark"
+msgstr ""
+
 #: src/summaryview.c:3088
 msgid "Sorting summary..."
 msgstr ""
@@ -18268,173 +18172,173 @@ msgstr ""
 msgid "To: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:4465
+#: src/summaryview.c:4466
 msgid "You're not the author of the article."
 msgstr ""
 
-#: src/summaryview.c:4555
+#: src/summaryview.c:4556
 #, 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:4558
+#: src/summaryview.c:4559
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4722
+#: src/summaryview.c:4723
 msgid "Destination is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4777
+#: src/summaryview.c:4778
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4828
+#: src/summaryview.c:4829
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4862
+#: src/summaryview.c:4863
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:5026
+#: src/summaryview.c:5027
 msgid "Append or Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5027
+#: src/summaryview.c:5028
 msgid "Append or overwrite existing file?"
 msgstr ""
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Append"
 msgstr ""
 
-#: src/summaryview.c:5028
+#: src/summaryview.c:5029
 msgid "_Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5039 src/summaryview.c:5042 src/summaryview.c:5057
+#: src/summaryview.c:5040 src/summaryview.c:5043 src/summaryview.c:5058
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
-#: src/summaryview.c:5080
+#: src/summaryview.c:5081
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/summaryview.c:5538
+#: src/summaryview.c:5539
 msgid "Building threads..."
 msgstr ""
 
-#: src/summaryview.c:5786
+#: src/summaryview.c:5787
 msgid "Skip these rules"
 msgstr ""
 
-#: src/summaryview.c:5789
+#: src/summaryview.c:5790
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5793
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
-#: src/summaryview.c:5821
+#: src/summaryview.c:5822
 msgid "Filtering"
 msgstr ""
 
-#: src/summaryview.c:5822
+#: src/summaryview.c:5823
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
-#: src/summaryview.c:5854
+#: src/summaryview.c:5855
 msgid "Filtering..."
 msgstr ""
 
-#: src/summaryview.c:5937
+#: src/summaryview.c:5938
 msgid "Processing configuration"
 msgstr ""
 
-#: src/summaryview.c:6087
+#: src/summaryview.c:6088
 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:6089
+#: src/summaryview.c:6090
 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:6090
+#: src/summaryview.c:6091
 msgid "Reset color label"
 msgstr "Reset colour label"
 
-#: src/summaryview.c:6090
+#: src/summaryview.c:6091
 msgid "Set color label"
 msgstr "Set colour label"
 
-#: src/summaryview.c:6529
+#: src/summaryview.c:6530
 msgid "Ignored thread"
 msgstr ""
 
-#: src/summaryview.c:6531
+#: src/summaryview.c:6532
 msgid "Watched thread"
 msgstr ""
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6540
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6541
+#: src/summaryview.c:6542
 msgid "Replied - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6553
+#: src/summaryview.c:6554
 msgid "To be moved"
 msgstr ""
 
-#: src/summaryview.c:6555
+#: src/summaryview.c:6556
 msgid "To be copied"
 msgstr ""
 
-#: src/summaryview.c:6567
+#: src/summaryview.c:6568
 msgid "Signed, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6571
+#: src/summaryview.c:6572
 msgid "Encrypted, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6573
+#: src/summaryview.c:6574
 msgid "Encrypted"
 msgstr ""
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6576
 msgid "Has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:8298
+#: src/summaryview.c:8302
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
-#: src/summaryview.c:8401
+#: src/summaryview.c:8406
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 
-#: src/summaryview.c:8406
+#: src/summaryview.c:8411
 msgid "Go back to the folder list"
 msgstr ""
 
@@ -18593,382 +18497,382 @@ msgstr ""
 msgid "Phishing attempt warning"
 msgstr ""
 
-#: src/toolbar.c:227 src/toolbar.c:2336
+#: src/toolbar.c:226 src/toolbar.c:2335
 msgid "Receive Mail from all Accounts"
 msgstr ""
 
-#: src/toolbar.c:228 src/toolbar.c:2341
+#: src/toolbar.c:227 src/toolbar.c:2340
 msgid "Receive Mail from current Account"
 msgstr ""
 
-#: src/toolbar.c:229 src/toolbar.c:2345
+#: src/toolbar.c:228 src/toolbar.c:2344
 msgid "Send Queued Messages"
 msgstr ""
 
-#: src/toolbar.c:230 src/toolbar.c:976 src/toolbar.c:2363 src/toolbar.c:2374
+#: src/toolbar.c:229 src/toolbar.c:975 src/toolbar.c:2362 src/toolbar.c:2373
 msgid "Compose Email"
 msgstr ""
 
-#: src/toolbar.c:231
+#: src/toolbar.c:230
 msgid "Compose News"
 msgstr ""
 
-#: src/toolbar.c:232 src/toolbar.c:2418 src/toolbar.c:2428
+#: src/toolbar.c:231 src/toolbar.c:2417 src/toolbar.c:2427
 msgid "Reply to Message"
 msgstr ""
 
-#: src/toolbar.c:233 src/toolbar.c:2435 src/toolbar.c:2445
+#: src/toolbar.c:232 src/toolbar.c:2434 src/toolbar.c:2444
 msgid "Reply to Sender"
 msgstr ""
 
-#: src/toolbar.c:234 src/toolbar.c:2452 src/toolbar.c:2462
+#: src/toolbar.c:233 src/toolbar.c:2451 src/toolbar.c:2461
 msgid "Reply to All"
 msgstr ""
 
-#: src/toolbar.c:235 src/toolbar.c:2469 src/toolbar.c:2479
+#: src/toolbar.c:234 src/toolbar.c:2468 src/toolbar.c:2478
 msgid "Reply to Mailing-list"
 msgstr ""
 
-#: src/toolbar.c:236 src/toolbar.c:2357
+#: src/toolbar.c:235 src/toolbar.c:2356
 msgid "Open email"
 msgstr ""
 
-#: src/toolbar.c:237 src/toolbar.c:2486 src/toolbar.c:2497
+#: src/toolbar.c:236 src/toolbar.c:2485 src/toolbar.c:2496
 msgid "Forward Message"
 msgstr ""
 
-#: src/toolbar.c:238 src/toolbar.c:2502
+#: src/toolbar.c:237 src/toolbar.c:2501
 msgid "Trash Message"
 msgstr "Move Message to Wastebin"
 
-#: src/toolbar.c:239 src/toolbar.c:2506
+#: src/toolbar.c:238 src/toolbar.c:2505
 msgid "Delete Message"
 msgstr ""
 
-#: src/toolbar.c:240
+#: src/toolbar.c:239
 msgid "Delete duplicate messages"
 msgstr ""
 
-#: src/toolbar.c:242 src/toolbar.c:2514
+#: src/toolbar.c:241 src/toolbar.c:2513
 msgid "Go to Previous Unread Message"
 msgstr ""
 
-#: src/toolbar.c:243 src/toolbar.c:2518
+#: src/toolbar.c:242 src/toolbar.c:2517
 msgid "Go to Next Unread Message"
 msgstr ""
 
-#: src/toolbar.c:247
+#: src/toolbar.c:246
 msgid "Mark Message"
 msgstr ""
 
-#: src/toolbar.c:248
+#: src/toolbar.c:247
 msgid "Unmark Message"
 msgstr ""
 
-#: src/toolbar.c:249
+#: src/toolbar.c:248
 msgid "Lock Message"
 msgstr ""
 
-#: src/toolbar.c:250
+#: src/toolbar.c:249
 msgid "Unlock Message"
 msgstr ""
 
-#: src/toolbar.c:251
+#: src/toolbar.c:250
 msgid "Mark all Messages as read"
 msgstr ""
 
-#: src/toolbar.c:252
+#: src/toolbar.c:251
 msgid "Mark all Messages as unread"
 msgstr ""
 
-#: src/toolbar.c:253
+#: src/toolbar.c:252
 msgid "Mark Message as read"
 msgstr ""
 
-#: src/toolbar.c:254
+#: src/toolbar.c:253
 msgid "Mark Message as unread"
 msgstr ""
 
-#: src/toolbar.c:255
+#: src/toolbar.c:254
 msgid "Run folder processing rules"
 msgstr ""
 
-#: src/toolbar.c:257 src/toolbar.c:525
+#: src/toolbar.c:256 src/toolbar.c:524
 msgid "Print"
 msgstr ""
 
-#: src/toolbar.c:258
+#: src/toolbar.c:257
 msgid "Learn Spam or Ham"
 msgstr ""
 
-#: src/toolbar.c:259
+#: src/toolbar.c:258
 msgid "Open folder/Go to folder list"
 msgstr ""
 
-#: src/toolbar.c:262 src/toolbar.c:2524
+#: src/toolbar.c:261 src/toolbar.c:2523
 msgid "Send Message"
 msgstr ""
 
-#: src/toolbar.c:263 src/toolbar.c:2528
+#: src/toolbar.c:262 src/toolbar.c:2527
 msgid "Put into queue folder and send later"
 msgstr ""
 
-#: src/toolbar.c:264 src/toolbar.c:2532
+#: src/toolbar.c:263 src/toolbar.c:2531
 msgid "Save to draft folder"
 msgstr ""
 
-#: src/toolbar.c:265 src/toolbar.c:2536
+#: src/toolbar.c:264 src/toolbar.c:2535
 msgid "Insert file"
 msgstr ""
 
-#: src/toolbar.c:266 src/toolbar.c:2540
+#: src/toolbar.c:265 src/toolbar.c:2539
 msgid "Attach file"
 msgstr ""
 
-#: src/toolbar.c:267 src/toolbar.c:2544
+#: src/toolbar.c:266 src/toolbar.c:2543
 msgid "Insert signature"
 msgstr ""
 
-#: src/toolbar.c:268 src/toolbar.c:2548
+#: src/toolbar.c:267 src/toolbar.c:2547
 msgid "Replace signature"
 msgstr ""
 
-#: src/toolbar.c:269 src/toolbar.c:2552
+#: src/toolbar.c:268 src/toolbar.c:2551
 msgid "Edit with external editor"
 msgstr ""
 
-#: src/toolbar.c:270 src/toolbar.c:2556
+#: src/toolbar.c:269 src/toolbar.c:2555
 msgid "Wrap long lines of current paragraph"
 msgstr ""
 
-#: src/toolbar.c:271 src/toolbar.c:2560
+#: src/toolbar.c:270 src/toolbar.c:2559
 msgid "Wrap all long lines"
 msgstr ""
 
-#: src/toolbar.c:274 src/toolbar.c:542 src/toolbar.c:2569
+#: src/toolbar.c:273 src/toolbar.c:541 src/toolbar.c:2568
 msgid "Check spelling"
 msgstr ""
 
-#: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2574
+#: src/toolbar.c:275 src/toolbar.c:543 src/toolbar.c:2573
 msgid "Sign"
 msgstr ""
 
-#: src/toolbar.c:277 src/toolbar.c:545 src/toolbar.c:2582
+#: src/toolbar.c:276 src/toolbar.c:544 src/toolbar.c:2581
 msgid "Encrypt"
 msgstr ""
 
-#: src/toolbar.c:278
+#: src/toolbar.c:277
 msgid "Claws Mail Actions Feature"
 msgstr ""
 
-#: src/toolbar.c:279 src/toolbar.c:2601
+#: src/toolbar.c:278 src/toolbar.c:2600
 msgid "Cancel receiving"
 msgstr ""
 
-#: src/toolbar.c:281 src/toolbar.c:2609
+#: src/toolbar.c:280 src/toolbar.c:2608
 msgid "Cancel receiving/sending"
 msgstr ""
 
-#: src/toolbar.c:282 src/toolbar.c:2349
+#: src/toolbar.c:281 src/toolbar.c:2348
 msgid "Close window"
 msgstr ""
 
-#: src/toolbar.c:284
+#: src/toolbar.c:283
 msgid "Claws Mail Plugins"
 msgstr ""
 
-#: src/toolbar.c:450 src/toolbar.c:506
+#: src/toolbar.c:449 src/toolbar.c:505
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/toolbar.c:495
+#: src/toolbar.c:494
 msgid "Get Mail"
 msgstr ""
 
-#: src/toolbar.c:496
+#: src/toolbar.c:495
 msgid "Get"
 msgstr ""
 
-#: src/toolbar.c:498 src/toolbar.c:499
+#: src/toolbar.c:497 src/toolbar.c:498
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr ""
 
-#: src/toolbar.c:501
+#: src/toolbar.c:500
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr ""
 
-#: src/toolbar.c:502
+#: src/toolbar.c:501
 msgid "All"
 msgstr ""
 
-#: src/toolbar.c:503
+#: src/toolbar.c:502
 msgid "List"
 msgstr ""
 
-#: src/toolbar.c:508 src/toolbar.c:2402 src/toolbar.c:2411
+#: src/toolbar.c:507 src/toolbar.c:2401 src/toolbar.c:2410
 msgid "Delete duplicates"
 msgstr ""
 
-#: src/toolbar.c:510
+#: src/toolbar.c:509
 msgid "Prev"
 msgstr ""
 
-#: src/toolbar.c:511
+#: src/toolbar.c:510
 msgid "Next"
 msgstr ""
 
-#: src/toolbar.c:519
+#: src/toolbar.c:518
 msgid "All read"
 msgstr ""
 
-#: src/toolbar.c:520
+#: src/toolbar.c:519
 msgid "All unread"
 msgstr ""
 
-#: src/toolbar.c:521
+#: src/toolbar.c:520
 msgid "Read"
 msgstr ""
 
-#: src/toolbar.c:523
+#: src/toolbar.c:522
 msgid "Run proc. rules"
 msgstr ""
 
-#: src/toolbar.c:527
+#: src/toolbar.c:526
 msgid "Folders"
 msgstr ""
 
-#: src/toolbar.c:532
+#: src/toolbar.c:531
 msgid "Draft"
 msgstr ""
 
-#: src/toolbar.c:535
+#: src/toolbar.c:534
 msgid "Insert sig."
 msgstr ""
 
-#: src/toolbar.c:536
+#: src/toolbar.c:535
 msgid "Replace sig."
 msgstr ""
 
-#: src/toolbar.c:537
+#: src/toolbar.c:536
 msgid "Edit"
 msgstr ""
 
-#: src/toolbar.c:538
+#: src/toolbar.c:537
 msgid "Wrap para."
 msgstr ""
 
-#: src/toolbar.c:539
+#: src/toolbar.c:538
 msgid "Wrap all"
 msgstr ""
 
-#: src/toolbar.c:547 src/toolbar.c:548
+#: src/toolbar.c:546 src/toolbar.c:547
 msgid "Stop"
 msgstr ""
 
-#: src/toolbar.c:549
+#: src/toolbar.c:548
 msgid "Stop all"
 msgstr ""
 
-#: src/toolbar.c:968
+#: src/toolbar.c:967
 msgid "Compose News message"
 msgstr ""
 
-#: src/toolbar.c:1007
+#: src/toolbar.c:1006
 msgid "Learn spam"
 msgstr ""
 
-#: src/toolbar.c:1016
+#: src/toolbar.c:1015
 msgid "Ham"
 msgstr ""
 
-#: src/toolbar.c:1018
+#: src/toolbar.c:1017
 msgid "Learn ham"
 msgstr ""
 
-#: src/toolbar.c:1956
+#: src/toolbar.c:1955
 msgid "Message will be signed"
 msgstr ""
 
-#: src/toolbar.c:1958
+#: src/toolbar.c:1957
 msgid "Message will not be signed"
 msgstr ""
 
-#: src/toolbar.c:1977
+#: src/toolbar.c:1976
 msgid "Message will be encrypted"
 msgstr ""
 
-#: src/toolbar.c:1979
+#: src/toolbar.c:1978
 msgid "Message will not be encrypted"
 msgstr ""
 
-#: src/toolbar.c:2331
+#: src/toolbar.c:2330
 msgid "Go to folder list"
 msgstr ""
 
-#: src/toolbar.c:2337
+#: src/toolbar.c:2336
 msgid "Receive Mail from selected Account"
 msgstr ""
 
-#: src/toolbar.c:2353
+#: src/toolbar.c:2352
 msgid "Open preferences"
 msgstr ""
 
-#: src/toolbar.c:2364
+#: src/toolbar.c:2363
 msgid "Compose with selected Account"
 msgstr ""
 
-#: src/toolbar.c:2385
+#: src/toolbar.c:2384
 msgid "Learn as..."
 msgstr ""
 
-#: src/toolbar.c:2395
+#: src/toolbar.c:2394
 msgid "Learn as _Spam"
 msgstr ""
 
-#: src/toolbar.c:2396
+#: src/toolbar.c:2395
 msgid "Learn as _Ham"
 msgstr ""
 
-#: src/toolbar.c:2403
+#: src/toolbar.c:2402
 msgid "Delete duplicates options"
 msgstr ""
 
-#: src/toolbar.c:2407
+#: src/toolbar.c:2406
 msgid "Delete duplicates in selected folder"
 msgstr ""
 
-#: src/toolbar.c:2408
+#: src/toolbar.c:2407
 msgid "Delete duplicates in all folders"
 msgstr ""
 
-#: src/toolbar.c:2419
+#: src/toolbar.c:2418
 msgid "Reply to Message options"
 msgstr ""
 
-#: src/toolbar.c:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
+#: src/toolbar.c:2422 src/toolbar.c:2439 src/toolbar.c:2456 src/toolbar.c:2473
 msgid "_Reply with quote"
 msgstr ""
 
-#: src/toolbar.c:2424 src/toolbar.c:2441 src/toolbar.c:2458 src/toolbar.c:2475
+#: src/toolbar.c:2423 src/toolbar.c:2440 src/toolbar.c:2457 src/toolbar.c:2474
 msgid "Reply without _quote"
 msgstr ""
 
-#: src/toolbar.c:2436
+#: src/toolbar.c:2435
 msgid "Reply to Sender options"
 msgstr ""
 
-#: src/toolbar.c:2453
+#: src/toolbar.c:2452
 msgid "Reply to All options"
 msgstr ""
 
-#: src/toolbar.c:2470
+#: src/toolbar.c:2469
 msgid "Reply to Mailing-list options"
 msgstr ""
 
-#: src/toolbar.c:2487
+#: src/toolbar.c:2486
 msgid "Forward Message options"
 msgstr ""
 
@@ -18984,20 +18888,20 @@ msgstr ""
 msgid "Included URLs:"
 msgstr ""
 
-#: src/uri_opener.c:209
+#: src/uri_opener.c:207
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr ""
 
-#: src/uri_opener.c:225
+#: src/uri_opener.c:223
 msgid "Open in browser"
 msgstr ""
 
-#: src/uri_opener.c:237
+#: src/uri_opener.c:235
 msgid "Any phishing URLs are shown in red, followed by the actual URL."
 msgstr ""
 
-#: src/uri_opener.c:245
+#: src/uri_opener.c:243
 msgid "Select All"
 msgstr ""
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list