[Commits] [SCM] claws branch, master, updated. 3.17.0-158-g2e92964

claws at claws-mail.org claws at claws-mail.org
Fri Nov 9 12:49:00 CET 2018


The branch, master has been updated
       via  2e92964066854a2367d7f9dd1c72a0d3f47f4ccc (commit)
      from  7e1fec1467f2414c01d5cdac05e5cd2a25b16067 (commit)

Summary of changes:
 po/en_GB.po | 8588 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 4551 insertions(+), 4037 deletions(-)


- Log -----------------------------------------------------------------
commit 2e92964066854a2367d7f9dd1c72a0d3f47f4ccc
Author: Paul <paul at claws-mail.org>
Date:   Fri Nov 9 11:48:49 2018 +0000

    update en_GB.po

diff --git a/po/en_GB.po b/po/en_GB.po
index 8de3cb7..8031944 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.13.1\n"
+"Project-Id-Version: Claws Mail 3.17.1\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2016-08-28 19:13+0200\n"
+"POT-Creation-Date: 2018-11-09 11:38+0000\n"
 "PO-Revision-Date: 2008-09-28 08:00+0000\n"
 "Last-Translator: Paul Mangan <paul at claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul at claws-mail.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:396 src/account.c:463
+#: src/account.c:402 src/account.c:469
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
 msgstr ""
 
-#: src/account.c:441
+#: src/account.c:447
 msgid "Can't create folder."
 msgstr ""
 
-#: src/account.c:728
+#: src/account.c:735
 msgid "Edit accounts"
 msgstr ""
 
-#: src/account.c:745
+#: src/account.c:752
 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:816
+#: src/account.c:823
 msgid " _Set as default account "
 msgstr ""
 
-#: src/account.c:908
+#: src/account.c:915
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
-#: src/account.c:915
+#: src/account.c:922
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: src/account.c:1075
+#: src/account.c:1119
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
-#: src/account.c:1077
+#: src/account.c:1121
 msgid "(Untitled)"
 msgstr ""
 
-#: src/account.c:1078
+#: src/account.c:1122
 msgid "Delete account"
 msgstr ""
 
-#: src/account.c:1562
+#: src/account.c:1596
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1568
+#: src/account.c:1602
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: src/account.c:1575 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:125 src/compose.c:7230 src/editaddress.c:1264
-#: src/editaddress.c:1321 src/editaddress.c:1341
-#: src/editaddress_other_attributes_ldap.c:302
-#: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:428
+#: src/account.c:1609 src/addrduplicates.c:471 src/addressadd.c:222
+#: src/addressbook.c:128 src/compose.c:7462 src/editaddress.c:1473
+#: src/editaddress.c:1502 src/editaddress.c:1518
+#: src/editaddress_other_attributes_ldap.c:371
+#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:170
+#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:427
 #: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1803
-#: src/plugins/pgpcore/select-keys.c:395 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1866 src/prefs_template.c:79
+#: src/mimeview.c:275 src/plugins/managesieve/sieve_manager.c:469
+#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: src/plugins/pgpcore/select-keys.c:463 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1874 src/prefs_template.c:79 src/prefs_themes.c:990
 msgid "Name"
 msgstr ""
 
-#: src/account.c:1583 src/prefs_account.c:1096 src/prefs_account.c:4141
+#: src/account.c:1617 src/prefs_account.c:1196 src/prefs_account.c:4644
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1591 src/ssl_manager.c:100
+#: src/account.c:1625 src/ssl_manager.c:109
 msgid "Server"
 msgstr ""
 
-#: src/action.c:382
+#: src/action.c:380
 #, c-format
 msgid "Could not get message file %d"
 msgstr ""
 
-#: src/action.c:419
+#: src/action.c:418
 msgid "Could not get message part."
 msgstr ""
 
-#: src/action.c:436
+#: src/action.c:435
 #, c-format
 msgid "Can't get part of multipart message: %s"
 msgstr ""
 
-#: src/action.c:608
+#: src/action.c:607
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
@@ -137,16 +137,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/action.c:989 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:884
-#: src/plugins/tnef_parse/tnef_parse.c:67
-#: src/plugins/vcalendar/vcal_folder.c:1821
-#: src/plugins/vcalendar/vcal_folder.c:1825
-#: src/plugins/vcalendar/vcal_folder.c:1836
-#: src/plugins/vcalendar/vcal_folder.c:1839 src/privacy.c:62
+#: src/action.c:989 src/compose.c:5257 src/compose.c:5262 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:858
+#: src/plugins/tnef_parse/tnef_parse.c:76
+#: src/plugins/vcalendar/vcal_folder.c:1824
+#: src/plugins/vcalendar/vcal_folder.c:1828
+#: src/plugins/vcalendar/vcal_folder.c:1846
+#: src/plugins/vcalendar/vcal_folder.c:1849 src/privacy.c:62
 msgid "Unknown error"
 msgstr ""
 
-#: src/action.c:1207 src/action.c:1372
+#: src/action.c:1207 src/action.c:1379
 msgid "Completed"
 msgstr ""
 
@@ -160,11 +161,11 @@ msgstr ""
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1280
+#: src/action.c:1293
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1608
+#: src/action.c:1625
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -172,11 +173,11 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1613
+#: src/action.c:1630
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1617
+#: src/action.c:1634
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -184,24 +185,24 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1622
+#: src/action.c:1639
 msgid "Action's user argument"
 msgstr ""
 
-#: src/addrclip.c:479
+#: src/addrclip.c:481
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addrclip.c:502
+#: src/addrclip.c:504
 msgid "Cannot copy an address book to itself."
 msgstr ""
 
-#: src/addrclip.c:593
+#: src/addrclip.c:595
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addr_compl.c:689 src/addressbook.c:4946
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:689 src/addressbook.c:5016
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr ""
 
@@ -241,66 +242,66 @@ msgstr ""
 msgid "website"
 msgstr ""
 
-#: src/addrcustomattr.c:141
+#: src/addrcustomattr.c:146
 msgid "Attribute name"
 msgstr ""
 
-#: src/addrcustomattr.c:156
+#: src/addrcustomattr.c:161
 msgid "Delete all attribute names"
 msgstr ""
 
-#: src/addrcustomattr.c:157
+#: src/addrcustomattr.c:162
 msgid "Do you really want to delete all attribute names?"
 msgstr ""
 
-#: src/addrcustomattr.c:181
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr ""
 
-#: src/addrcustomattr.c:182
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr ""
 
-#: src/addrcustomattr.c:191
+#: src/addrcustomattr.c:196
 msgid "Reset to default"
 msgstr ""
 
-#: src/addrcustomattr.c:192
+#: src/addrcustomattr.c:197
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
 
-#: src/addrcustomattr.c:212 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/edittags.c:272
-#: src/plugins/archive/archiver_gtk.c:1186 src/prefs_actions.c:1090
-#: src/prefs_filtering.c:1693 src/prefs_template.c:1119
+#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1085
+#: src/prefs_filtering.c:1699 src/prefs_template.c:1111
 msgid "_Delete"
 msgstr ""
 
-#: src/addrcustomattr.c:213 src/edittags.c:273 src/prefs_actions.c:1091
-#: src/prefs_filtering.c:1694 src/prefs_template.c:1120
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1086
+#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "Delete _all"
 msgstr ""
 
-#: src/addrcustomattr.c:214
+#: src/addrcustomattr.c:219
 msgid "_Reset to default"
 msgstr ""
 
-#: src/addrcustomattr.c:403
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr ""
 
-#: src/addrcustomattr.c:462
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr ""
 
-#: src/addrcustomattr.c:476
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr ""
 
-#: src/addrcustomattr.c:513
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -331,8 +332,8 @@ msgstr ""
 msgid "Duplicate email addresses"
 msgstr ""
 
-#: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:396 src/toolbar.c:434
+#: src/addrduplicates.c:442 src/addressadd.c:234
+#: src/plugins/pgpcore/select-keys.c:469 src/toolbar.c:529
 msgid "Address"
 msgstr ""
 
@@ -340,50 +341,50 @@ msgstr ""
 msgid "Address book path"
 msgstr ""
 
-#: src/addrduplicates.c:793 src/addressbook.c:1438 src/addressbook.c:1491
+#: src/addrduplicates.c:790 src/addressbook.c:1441 src/addressbook.c:1494
 msgid "Delete address(es)"
 msgstr ""
 
-#: src/addrduplicates.c:794 src/addressbook.c:1492
+#: src/addrduplicates.c:791 src/addressbook.c:1495
 msgid "Really delete the address(es)?"
 msgstr ""
 
-#: src/addrduplicates.c:842
+#: src/addrduplicates.c:840
 msgid "Delete address"
 msgstr ""
 
-#: src/addrduplicates.c:843 src/addressbook.c:1439
+#: src/addrduplicates.c:841 src/addressbook.c:1442
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 
-#: src/addressadd.c:185 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:195
 msgid "Add to address book"
 msgstr ""
 
-#: src/addressadd.c:207
+#: src/addressadd.c:214
 msgid "Contact"
 msgstr ""
 
-#: src/addressadd.c:238 src/addressbook.c:127 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:245 src/addressbook.c:130 src/editaddress.c:1257
+#: src/editaddress.c:1301 src/editgroup.c:292
 msgid "Remarks"
 msgstr ""
 
-#: src/addressadd.c:257 src/addressbook_foldersel.c:158
+#: src/addressadd.c:286 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr ""
 
-#: src/addressadd.c:534 src/addressbook.c:3216 src/addressbook.c:3267
+#: src/addressadd.c:596 src/addressbook.c:3264 src/addressbook.c:3315
 msgid "Add address(es)"
 msgstr ""
 
-#: src/addressadd.c:535
+#: src/addressadd.c:597
 msgid "Can't add the specified address"
 msgstr ""
 
-#: src/addressbook.c:126 src/addressbook.c:4934 src/editaddress.c:1053
-#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
+#: src/addressbook.c:129 src/addressbook.c:5004 src/editaddress.c:1246
+#: src/editaddress.c:1284 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr ""
 
@@ -391,27 +392,27 @@ msgstr ""
 msgid "_Book"
 msgstr ""
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:465
-#: src/addressbook.c:482 src/compose.c:586 src/mainwindow.c:512
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:515
+#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr ""
 
-#: src/addressbook.c:407 src/compose.c:591 src/mainwindow.c:515
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:518
+#: src/messageview.c:215
 msgid "_Tools"
 msgstr ""
 
-#: src/addressbook.c:408 src/compose.c:592 src/mainwindow.c:517
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:520
+#: src/messageview.c:216
 msgid "_Help"
 msgstr ""
 
-#: src/addressbook.c:411 src/addressbook.c:468
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Book"
 msgstr ""
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:412 src/addressbook.c:470
 msgid "New _Folder"
 msgstr ""
 
@@ -435,471 +436,457 @@ msgstr ""
 msgid "_Delete book"
 msgstr ""
 
-#: src/addressbook.c:427 src/compose.c:603
+#: src/addressbook.c:427 src/compose.c:624
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:433
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:428 src/compose.c:607 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr ""
 
-#: src/addressbook.c:431 src/addressbook.c:480 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
 msgid "_Select all"
 msgstr ""
 
-#: src/addressbook.c:433 src/addressbook.c:472 src/addressbook.c:488
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr ""
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
-#: src/compose.c:615 src/mainwindow.c:546 src/messageview.c:225
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:636 src/mainwindow.c:549 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr ""
 
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:616 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr ""
 
-#: src/addressbook.c:440 src/addressbook.c:485
+#: src/addressbook.c:440 src/addressbook.c:486
 msgid "New _Address"
 msgstr ""
 
-#: src/addressbook.c:441 src/addressbook.c:470 src/addressbook.c:486
+#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr ""
 
-#: src/addressbook.c:443 src/addressbook.c:492
+#: src/addressbook.c:443 src/addressbook.c:493
 msgid "_Mail To"
 msgstr ""
 
-#: src/addressbook.c:447
-msgid "Import _LDIF file..."
+#: src/addressbook.c:444 src/addressbook.c:497
+msgid "_Merge"
 msgstr ""
 
 #: src/addressbook.c:448
-msgid "Import M_utt file..."
+msgid "Import _LDIF file..."
 msgstr ""
 
 #: src/addressbook.c:449
+msgid "Import M_utt file..."
+msgstr ""
+
+#: src/addressbook.c:450
 msgid "Import _Pine file..."
 msgstr ""
 
-#: src/addressbook.c:451
+#: src/addressbook.c:452
 msgid "Export _HTML..."
 msgstr ""
 
-#: src/addressbook.c:452
+#: src/addressbook.c:453
 msgid "Export LDI_F..."
 msgstr ""
 
-#: src/addressbook.c:454
+#: src/addressbook.c:455
 msgid "Find duplicates..."
 msgstr ""
 
-#: src/addressbook.c:455
+#: src/addressbook.c:456
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:458 src/compose.c:695 src/mainwindow.c:813
-#: src/messageview.c:338
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:814
+#: src/messageview.c:340
 msgid "_About"
 msgstr ""
 
-#: src/addressbook.c:494
+#: src/addressbook.c:495
 msgid "_Browse Entry"
 msgstr ""
 
-#: src/addressbook.c:507 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:250 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:682
-#: src/prefs_themes.c:714 src/prefs_themes.c:715
+#: src/addressbook.c:509 src/crash.c:456 src/crash.c:475 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
+#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
+#: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr ""
 
-#: src/addressbook.c:514 src/addressbook.c:533 src/importldif.c:121
+#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
 msgid "Success"
 msgstr ""
 
-#: src/addressbook.c:515 src/importldif.c:122
+#: src/addressbook.c:517 src/importldif.c:122
 msgid "Bad arguments"
 msgstr ""
 
-#: src/addressbook.c:516 src/importldif.c:123
+#: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
 msgstr ""
 
-#: src/addressbook.c:517 src/importldif.c:124
+#: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
 msgstr ""
 
-#: src/addressbook.c:518 src/importldif.c:125
+#: src/addressbook.c:520 src/importldif.c:125
 msgid "Error reading file"
 msgstr ""
 
-#: src/addressbook.c:519 src/importldif.c:126
+#: src/addressbook.c:521 src/importldif.c:126
 msgid "End of file encountered"
 msgstr ""
 
-#: src/addressbook.c:520 src/importldif.c:127
+#: src/addressbook.c:522 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr ""
 
-#: src/addressbook.c:521 src/importldif.c:128
+#: src/addressbook.c:523 src/importldif.c:128
 msgid "Bad file format"
 msgstr ""
 
-#: src/addressbook.c:522 src/importldif.c:129
+#: src/addressbook.c:524 src/importldif.c:129
 msgid "Error writing to file"
 msgstr ""
 
-#: src/addressbook.c:523 src/importldif.c:130
+#: src/addressbook.c:525 src/importldif.c:130
 msgid "Error opening directory"
 msgstr ""
 
-#: src/addressbook.c:524 src/importldif.c:131
+#: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
 msgstr ""
 
-#: src/addressbook.c:534
+#: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:535
+#: src/addressbook.c:537
 msgid "Error initializing LDAP"
 msgstr ""
 
-#: src/addressbook.c:536
+#: src/addressbook.c:538
 msgid "Error binding to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:537
+#: src/addressbook.c:539
 msgid "Error searching LDAP database"
 msgstr ""
 
-#: src/addressbook.c:538
+#: src/addressbook.c:540
 msgid "Timeout performing LDAP operation"
 msgstr ""
 
-#: src/addressbook.c:539
+#: src/addressbook.c:541
 msgid "Error in LDAP search criteria"
 msgstr ""
 
-#: src/addressbook.c:540
+#: src/addressbook.c:542
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 
-#: src/addressbook.c:541
+#: src/addressbook.c:543
 msgid "LDAP search terminated on request"
 msgstr ""
 
-#: src/addressbook.c:542
-msgid "Error starting TLS connection"
+#: src/addressbook.c:544
+msgid "Error starting STARTTLS connection"
 msgstr ""
 
-#: src/addressbook.c:543
+#: src/addressbook.c:545
 msgid "Distinguished Name (dn) is missing"
 msgstr ""
 
-#: src/addressbook.c:544
+#: src/addressbook.c:546
 msgid "Missing required information"
 msgstr ""
 
-#: src/addressbook.c:545
+#: src/addressbook.c:547
 msgid "Another contact exists with that key"
 msgstr ""
 
-#: src/addressbook.c:546
+#: src/addressbook.c:548
 msgid "Strong(er) authentication required"
 msgstr ""
 
-#: src/addressbook.c:913
+#: src/addressbook.c:916
 msgid "Sources"
 msgstr ""
 
-#: src/addressbook.c:917 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:225 src/toolbar.c:2142
+#: src/addressbook.c:920 src/prefs_matcher.c:642 src/prefs_other.c:490
+#: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr ""
 
-#: src/addressbook.c:1112 src/editldap.c:780
+#: src/addressbook.c:1114 src/editldap.c:793
 msgid "Search"
 msgstr ""
 
-#: src/addressbook.c:1483
+#: src/addressbook.c:1486
 msgid "Delete group"
 msgstr ""
 
-#: src/addressbook.c:1484
+#: src/addressbook.c:1487
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2195
+#: src/addressbook.c:2214
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 
-#: src/addressbook.c:2205
+#: src/addressbook.c:2224
 msgid "Cannot paste into an address group."
 msgstr ""
 
-#: src/addressbook.c:2913
+#: src/addressbook.c:2961
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 
-#: src/addressbook.c:2916 src/addressbook.c:2942 src/addressbook.c:2949
-#: src/plugins/archive/archiver_prefs.c:329 src/prefs_filtering_action.c:177
-#: src/toolbar.c:415
+#: src/addressbook.c:2964 src/addressbook.c:2990 src/addressbook.c:2997
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
+#: src/toolbar.c:497
 msgid "Delete"
 msgstr ""
 
-#: src/addressbook.c:2925
+#: src/addressbook.c:2973
 #, 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:2928 src/imap_gtk.c:360 src/mh_gtk.c:206
+#: src/addressbook.c:2976 src/imap_gtk.c:368 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
-#: src/plugins/vcalendar/vcal_folder.c:1984
 msgid "Delete folder"
 msgstr ""
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2977
 msgid "Delete _folder only"
 msgstr ""
 
-#: src/addressbook.c:2929
+#: src/addressbook.c:2977
 msgid "Delete folder and _addresses"
 msgstr ""
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2988
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2947
+#: src/addressbook.c:2995
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
-#: src/addressbook.c:3061
+#: src/addressbook.c:3109
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
-#: src/addressbook.c:3199 src/addressbook.c:3248
+#: src/addressbook.c:3247 src/addressbook.c:3296
 msgid "New Contacts"
 msgstr ""
 
-#: src/addressbook.c:4087
+#: src/addressbook.c:4135
 msgid "New user, could not save index file."
 msgstr ""
 
-#: src/addressbook.c:4091
+#: src/addressbook.c:4139
 msgid "New user, could not save address book files."
 msgstr ""
 
-#: src/addressbook.c:4101
+#: src/addressbook.c:4149
 msgid "Old address book converted successfully."
 msgstr ""
 
-#: src/addressbook.c:4106
+#: src/addressbook.c:4154
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4119
+#: src/addressbook.c:4167
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:4125
+#: src/addressbook.c:4173
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4130
+#: src/addressbook.c:4178
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:4137 src/addressbook.c:4143
+#: src/addressbook.c:4185 src/addressbook.c:4191
 msgid "Addressbook conversion error"
 msgstr ""
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4306
 msgid "Addressbook Error"
 msgstr ""
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4307
 msgid "Could not read address index"
 msgstr ""
 
-#: src/addressbook.c:4589
+#: src/addressbook.c:4638
 msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:4898 src/prefs_send.c:188
+#: src/addressbook.c:4968 src/prefs_send.c:220
 msgid "Interface"
 msgstr ""
 
-#: src/addressbook.c:4910
+#: src/addressbook.c:4980
 msgid "Address Books"
 msgstr ""
 
-#: src/addressbook.c:4922
+#: src/addressbook.c:4992
 msgid "Person"
 msgstr ""
 
-#: src/addressbook.c:4958 src/exporthtml.c:884 src/folderview.c:347
-#: src/folderview.c:435 src/prefs_account.c:2799 src/prefs_folder_column.c:78
+#: src/addressbook.c:5028 src/exporthtml.c:885 src/folderview.c:354
+#: src/folderview.c:442 src/prefs_account.c:3169 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr ""
 
-#: src/addressbook.c:4970
+#: src/addressbook.c:5040
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:4982 src/addressbook.c:4994
+#: src/addressbook.c:5052 src/addressbook.c:5064
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:5006
+#: src/addressbook.c:5076
 msgid "LDAP servers"
 msgstr ""
 
-#: src/addressbook.c:5018
+#: src/addressbook.c:5088
 msgid "LDAP Query"
 msgstr ""
 
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
+#: src/addressbook_foldersel.c:200 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr ""
 
-#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
-#: src/plugins/bogofilter/bogofilter_gtk.c:274
-#: src/plugins/bogofilter/bogofilter_gtk.c:347
-#: src/plugins/bogofilter/bogofilter_gtk.c:424
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:442
-#: src/plugins/spamassassin/spamassassin_gtk.c:489
-#: src/plugins/spamassassin/spamassassin_gtk.c:612 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1625
-#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1635 src/prefs_matcher.c:2519
-#: src/prefs_matcher.c:2523
-msgid "Any"
-msgstr ""
-
-#: src/addrgather.c:173
+#: src/addrgather.c:179
 msgid "Please specify name for address book."
 msgstr ""
 
-#: src/addrgather.c:180
+#: src/addrgather.c:186
 msgid "No available address book."
 msgstr ""
 
-#: src/addrgather.c:201
+#: src/addrgather.c:207
 msgid "Please select the mail headers to search."
 msgstr ""
 
-#: src/addrgather.c:208
+#: src/addrgather.c:214
 msgid "Collecting addresses..."
 msgstr ""
 
-#: src/addrgather.c:248
-msgid "address added by claws-mail"
+#: src/addrgather.c:254
+msgid "address added by Claws Mail"
 msgstr ""
 
-#: src/addrgather.c:276
+#: src/addrgather.c:285
 msgid "Addresses collected successfully."
 msgstr ""
 
-#: src/addrgather.c:351
+#: src/addrgather.c:360
 msgid "Current folder:"
 msgstr ""
 
-#: src/addrgather.c:362
+#: src/addrgather.c:371
 msgid "Address book name:"
 msgstr ""
 
-#: src/addrgather.c:389
+#: src/addrgather.c:398
 msgid "Address book folder size:"
 msgstr ""
 
-#: src/addrgather.c:393 src/addrgather.c:403
+#: src/addrgather.c:402 src/addrgather.c:411
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr ""
 
-#: src/addrgather.c:407
+#: src/addrgather.c:415
 msgid "Process these mail header fields"
 msgstr ""
 
-#: src/addrgather.c:426
+#: src/addrgather.c:434
 msgid "Include subfolders"
 msgstr ""
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1425
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1383
 msgid "Header Name"
 msgstr ""
 
-#: src/addrgather.c:451
+#: src/addrgather.c:498
 msgid "Address Count"
 msgstr ""
 
-#: src/addrgather.c:561
+#: src/addrgather.c:585
 msgid "Header Fields"
 msgstr ""
 
-#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:1022
+#: src/addrgather.c:586 src/exphtmldlg.c:658 src/expldifdlg.c:722
+#: src/importldif.c:981
 msgid "Finish"
 msgstr ""
 
-#: src/addrgather.c:620
+#: src/addrgather.c:644
 msgid "Collect email addresses from selected messages"
 msgstr ""
 
-#: src/addrgather.c:624
+#: src/addrgather.c:648
 msgid "Collect email addresses from folder"
 msgstr ""
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Common addresses"
 msgstr ""
 
-#: src/addrindex.c:125
+#: src/addrindex.c:126
 msgid "Personal addresses"
 msgstr ""
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Common address"
 msgstr ""
 
-#: src/addrindex.c:132
+#: src/addrindex.c:133
 msgid "Personal address"
 msgstr ""
 
@@ -911,132 +898,132 @@ msgstr ""
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
-#: src/alertpanel.c:146 src/compose.c:9479
+#: src/alertpanel.c:144 src/compose.c:9783
 msgid "Notice"
 msgstr ""
 
-#: src/alertpanel.c:159 src/compose.c:5694 src/compose.c:6217
-#: src/compose.c:11920 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:854 src/messageview.c:867 src/plugins/pgpcore/sgpgme.c:788
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4866
+#: src/alertpanel.c:157 src/compose.c:5848 src/compose.c:6390
+#: src/compose.c:12246 src/file_checker.c:79 src/file_checker.c:102
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:807
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5037
 msgid "Warning"
 msgstr ""
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5635 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:314
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5785 src/inc.c:720
+#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr ""
 
-#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr ""
 
-#: src/alertpanel.c:347
+#: src/alertpanel.c:346
 msgid "Show this message next time"
 msgstr ""
 
-#: src/browseldap.c:218
+#: src/browseldap.c:223
 msgid "Browse Directory Entry"
 msgstr ""
 
-#: src/browseldap.c:237
+#: src/browseldap.c:243
 msgid "Server Name:"
 msgstr ""
 
-#: src/browseldap.c:247
+#: src/browseldap.c:253
 msgid "Distinguished Name (dn):"
 msgstr ""
 
-#: src/browseldap.c:270
+#: src/browseldap.c:284
 msgid "LDAP Name"
 msgstr ""
 
-#: src/browseldap.c:272
+#: src/browseldap.c:290
 msgid "Attribute Value"
 msgstr ""
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "Nothing"
 msgstr ""
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a viewer"
 msgstr ""
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "a MIME parser"
 msgstr ""
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "folders"
 msgstr ""
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:74
 msgid "filtering"
 msgstr ""
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:75
 msgid "a privacy interface"
 msgstr ""
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:76
 msgid "a notifier"
 msgstr ""
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:77
 msgid "an utility"
 msgstr ""
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:78
 msgid "things"
 msgstr ""
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:438
 msgid "Plugin already loaded"
 msgstr ""
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 
-#: src/common/plugin.c:482
+#: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr ""
 
-#: src/common/plugin.c:491
+#: src/common/plugin.c:492
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
-#: src/common/plugin.c:769
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr ""
 
-#: src/common/plugin.c:772
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr ""
 
-#: src/common/plugin.c:781
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr ""
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
-#: src/common/session.c:183 src/imap.c:1213
-msgid "SSL handshake failed\n"
+#: src/common/session.c:202 src/imap.c:1226
+msgid "SSL/TLS handshake failed\n"
 msgstr ""
 
 #: src/common/smtp.c:179
@@ -1055,7 +1042,7 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr ""
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:906
 msgid "error occurred on authentication\n"
 msgstr ""
 
@@ -1064,113 +1051,113 @@ msgstr ""
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 
-#: src/common/smtp.c:617 src/pop.c:898
-msgid "couldn't start TLS session\n"
+#: src/common/smtp.c:617 src/pop.c:899
+msgid "couldn't start STARTTLS session\n"
 msgstr ""
 
-#: src/common/socket.c:569
+#: src/common/socket.c:573
 msgid "Socket IO timeout.\n"
 msgstr ""
 
-#: src/common/socket.c:598
+#: src/common/socket.c:602
 msgid "Connection timed out.\n"
 msgstr ""
 
-#: src/common/socket.c:732
+#: src/common/socket.c:742
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr ""
 
-#: src/common/socket.c:972
+#: src/common/socket.c:982
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr ""
 
-#: src/common/socket.c:1064
+#: src/common/socket.c:1074
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr ""
 
-#: src/common/socket.c:1368
+#: src/common/socket.c:1378
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:327
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:335
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:344
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:629
 msgid "Internal error"
 msgstr ""
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:634
 msgid "Uncheckable"
 msgstr ""
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:638
 msgid "Self-signed certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:641
 msgid "Revoked certificate"
 msgstr ""
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:643
 msgid "No certificate issuer found"
 msgstr ""
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:645
 msgid "Certificate issuer is not a CA"
 msgstr ""
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:870
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:874
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:893
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:897
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1045
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1048
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1052
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
+#: src/common/ssl_certificate.c:1077 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
@@ -1181,646 +1168,656 @@ msgstr ""
 msgid "(Subject cleared by RegExp)"
 msgstr ""
 
-#: src/common/utils.c:259
+#: src/common/utils.c:198
 #, c-format
 msgid "%dB"
 msgstr ""
 
-#: src/common/utils.c:260
+#: src/common/utils.c:199
 #, c-format
 msgid "%d.%02dKB"
 msgstr ""
 
-#: src/common/utils.c:261
+#: src/common/utils.c:200
 #, c-format
 msgid "%d.%02dMB"
 msgstr ""
 
-#: src/common/utils.c:262
+#: src/common/utils.c:201
 #, c-format
 msgid "%.2fGB"
 msgstr ""
 
-#: src/common/utils.c:4823
+#: src/common/utils.c:4009
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr ""
 
-#: src/common/utils.c:4824
+#: src/common/utils.c:4010
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr ""
 
-#: src/common/utils.c:4825
+#: src/common/utils.c:4011
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr ""
 
-#: src/common/utils.c:4826
+#: src/common/utils.c:4012
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr ""
 
-#: src/common/utils.c:4827
+#: src/common/utils.c:4013
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr ""
 
-#: src/common/utils.c:4828
+#: src/common/utils.c:4014
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr ""
 
-#: src/common/utils.c:4829
+#: src/common/utils.c:4015
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr ""
 
-#: src/common/utils.c:4831
+#: src/common/utils.c:4017
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr ""
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4018
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr ""
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4019
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr ""
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4020
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr ""
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4021
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4836
+#: src/common/utils.c:4022
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr ""
 
-#: src/common/utils.c:4837
+#: src/common/utils.c:4023
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr ""
 
-#: src/common/utils.c:4838
+#: src/common/utils.c:4024
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr ""
 
-#: src/common/utils.c:4839
+#: src/common/utils.c:4025
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr ""
 
-#: src/common/utils.c:4840
+#: src/common/utils.c:4026
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr ""
 
-#: src/common/utils.c:4841
+#: src/common/utils.c:4027
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr ""
 
-#: src/common/utils.c:4842
+#: src/common/utils.c:4028
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr ""
 
-#: src/common/utils.c:4844
+#: src/common/utils.c:4030
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr ""
 
-#: src/common/utils.c:4845
+#: src/common/utils.c:4031
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr ""
 
-#: src/common/utils.c:4846
+#: src/common/utils.c:4032
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr ""
 
-#: src/common/utils.c:4847
+#: src/common/utils.c:4033
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr ""
 
-#: src/common/utils.c:4848
+#: src/common/utils.c:4034
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr ""
 
-#: src/common/utils.c:4849
+#: src/common/utils.c:4035
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr ""
 
-#: src/common/utils.c:4850
+#: src/common/utils.c:4036
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr ""
 
-#: src/common/utils.c:4852
+#: src/common/utils.c:4038
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr ""
 
-#: src/common/utils.c:4853
+#: src/common/utils.c:4039
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr ""
 
-#: src/common/utils.c:4854
+#: src/common/utils.c:4040
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr ""
 
-#: src/common/utils.c:4855
+#: src/common/utils.c:4041
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr ""
 
-#: src/common/utils.c:4856
+#: src/common/utils.c:4042
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4857
+#: src/common/utils.c:4043
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr ""
 
-#: src/common/utils.c:4858
+#: src/common/utils.c:4044
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr ""
 
-#: src/common/utils.c:4859
+#: src/common/utils.c:4045
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr ""
 
-#: src/common/utils.c:4860
+#: src/common/utils.c:4046
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr ""
 
-#: src/common/utils.c:4861
+#: src/common/utils.c:4047
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr ""
 
-#: src/common/utils.c:4862
+#: src/common/utils.c:4048
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr ""
 
-#: src/common/utils.c:4863
+#: src/common/utils.c:4049
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr ""
 
-#: src/common/utils.c:4874
+#: src/common/utils.c:4060
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr ""
 
-#: src/common/utils.c:4875
+#: src/common/utils.c:4061
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr ""
 
-#: src/common/utils.c:4876
+#: src/common/utils.c:4062
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr ""
 
-#: src/common/utils.c:4877
+#: src/common/utils.c:4063
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr ""
 
-#: src/compose.c:575
+#: src/compose.c:596
 msgid "_Add..."
 msgstr ""
 
-#: src/compose.c:576 src/mh_gtk.c:367 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:321
 msgid "_Remove"
 msgstr ""
 
-#: src/compose.c:578 src/folderview.c:246
+#: src/compose.c:599 src/folderview.c:253
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:585 src/mainwindow.c:514 src/messageview.c:211
+#: src/compose.c:606 src/mainwindow.c:517 src/messageview.c:214
 msgid "_Message"
 msgstr ""
 
-#: src/compose.c:588
+#: src/compose.c:609
 msgid "_Spelling"
 msgstr ""
 
-#: src/compose.c:590 src/compose.c:657
+#: src/compose.c:611 src/compose.c:678
 msgid "_Options"
 msgstr ""
 
-#: src/compose.c:594
+#: src/compose.c:615
 msgid "S_end"
 msgstr ""
 
-#: src/compose.c:595
+#: src/compose.c:616
 msgid "Send _later"
 msgstr ""
 
-#: src/compose.c:598
+#: src/compose.c:619
 msgid "_Attach file"
 msgstr ""
 
-#: src/compose.c:599
+#: src/compose.c:620
 msgid "_Insert file"
 msgstr ""
 
-#: src/compose.c:600
+#: src/compose.c:621
 msgid "Insert si_gnature"
 msgstr ""
 
-#: src/compose.c:601
+#: src/compose.c:622
 msgid "_Replace signature"
 msgstr ""
 
-#: src/compose.c:605
+#: src/compose.c:626
 msgid "_Print"
 msgstr ""
 
-#: src/compose.c:610 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr ""
 
-#: src/compose.c:611 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr ""
 
-#: src/compose.c:614 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr ""
 
-#: src/compose.c:618
+#: src/compose.c:639
 msgid "_Special paste"
 msgstr ""
 
-#: src/compose.c:619
+#: src/compose.c:640
 msgid "As _quotation"
 msgstr ""
 
-#: src/compose.c:620
+#: src/compose.c:641
 msgid "_Wrapped"
 msgstr ""
 
-#: src/compose.c:621
+#: src/compose.c:642
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:623 src/mainwindow.c:547
+#: src/compose.c:644 src/mainwindow.c:550
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
 
-#: src/compose.c:625
+#: src/compose.c:646
 msgid "A_dvanced"
 msgstr ""
 
-#: src/compose.c:626
+#: src/compose.c:647
 msgid "Move a character backward"
 msgstr ""
 
-#: src/compose.c:627
+#: src/compose.c:648
 msgid "Move a character forward"
 msgstr ""
 
-#: src/compose.c:628
+#: src/compose.c:649
 msgid "Move a word backward"
 msgstr ""
 
-#: src/compose.c:629
+#: src/compose.c:650
 msgid "Move a word forward"
 msgstr ""
 
-#: src/compose.c:630
+#: src/compose.c:651
 msgid "Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:631
+#: src/compose.c:652
 msgid "Move to end of line"
 msgstr ""
 
-#: src/compose.c:632
+#: src/compose.c:653
 msgid "Move to previous line"
 msgstr ""
 
-#: src/compose.c:633
+#: src/compose.c:654
 msgid "Move to next line"
 msgstr ""
 
-#: src/compose.c:634
+#: src/compose.c:655
 msgid "Delete a character backward"
 msgstr ""
 
-#: src/compose.c:635
+#: src/compose.c:656
 msgid "Delete a character forward"
 msgstr ""
 
-#: src/compose.c:636
+#: src/compose.c:657
 msgid "Delete a word backward"
 msgstr ""
 
-#: src/compose.c:637
+#: src/compose.c:658
 msgid "Delete a word forward"
 msgstr ""
 
-#: src/compose.c:638
+#: src/compose.c:659
 msgid "Delete line"
 msgstr ""
 
-#: src/compose.c:639
+#: src/compose.c:660
 msgid "Delete to end of line"
 msgstr ""
 
-#: src/compose.c:642 src/messageview.c:228
+#: src/compose.c:663 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr ""
 
-#: src/compose.c:645
+#: src/compose.c:666
 msgid "_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:646
+#: src/compose.c:667
 msgid "Wrap all long _lines"
 msgstr ""
 
-#: src/compose.c:648
+#: src/compose.c:669
 msgid "Edit with e_xternal editor"
 msgstr ""
 
-#: src/compose.c:651
+#: src/compose.c:672
 msgid "_Check all or check selection"
 msgstr ""
 
-#: src/compose.c:652
+#: src/compose.c:673
 msgid "_Highlight all misspelled words"
 msgstr ""
 
-#: src/compose.c:653
+#: src/compose.c:674
 msgid "Check _backwards misspelled word"
 msgstr ""
 
-#: src/compose.c:654
+#: src/compose.c:675
 msgid "_Forward to next misspelled word"
 msgstr ""
 
-#: src/compose.c:662
+#: src/compose.c:682
 msgid "Reply _mode"
 msgstr ""
 
-#: src/compose.c:664
+#: src/compose.c:684
 msgid "Privacy _System"
 msgstr ""
 
-#: src/compose.c:669
+#: src/compose.c:688
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:671 src/mainwindow.c:610 src/messageview.c:264
+#: src/compose.c:690 src/mainwindow.c:612 src/messageview.c:267
 msgid "Character _encoding"
 msgstr ""
 
-#: src/compose.c:676 src/mainwindow.c:615 src/messageview.c:269
+#: src/compose.c:695 src/mainwindow.c:617 src/messageview.c:272
 msgid "Western European"
 msgstr ""
 
-#: src/compose.c:677 src/mainwindow.c:616 src/messageview.c:270
+#: src/compose.c:696 src/mainwindow.c:618 src/messageview.c:273
 msgid "Baltic"
 msgstr ""
 
-#: src/compose.c:678 src/mainwindow.c:617 src/messageview.c:271
+#: src/compose.c:697 src/mainwindow.c:619 src/messageview.c:274
 msgid "Hebrew"
 msgstr ""
 
-#: src/compose.c:679 src/mainwindow.c:618 src/messageview.c:272
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:275
 msgid "Arabic"
 msgstr ""
 
-#: src/compose.c:680 src/mainwindow.c:619 src/messageview.c:273
+#: src/compose.c:699 src/mainwindow.c:621 src/messageview.c:276
 msgid "Cyrillic"
 msgstr ""
 
-#: src/compose.c:681 src/mainwindow.c:620 src/messageview.c:274
+#: src/compose.c:700 src/mainwindow.c:622 src/messageview.c:277
 msgid "Japanese"
 msgstr ""
 
-#: src/compose.c:682 src/mainwindow.c:621 src/messageview.c:275
+#: src/compose.c:701 src/mainwindow.c:623 src/messageview.c:278
 msgid "Chinese"
 msgstr ""
 
-#: src/compose.c:683 src/mainwindow.c:622 src/messageview.c:276
+#: src/compose.c:702 src/mainwindow.c:624 src/messageview.c:279
 msgid "Korean"
 msgstr ""
 
-#: src/compose.c:684 src/mainwindow.c:623 src/messageview.c:277
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:280
 msgid "Thai"
 msgstr ""
 
-#: src/compose.c:687 src/mainwindow.c:732 src/messageview.c:313
+#: src/compose.c:706 src/mainwindow.c:735 src/messageview.c:316
 msgid "_Address book"
 msgstr ""
 
-#: src/compose.c:689
+#: src/compose.c:708
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:691 src/mainwindow.c:760 src/messageview.c:334
+#: src/compose.c:710 src/mainwindow.c:763 src/messageview.c:336
 msgid "Actio_ns"
 msgstr ""
 
-#: src/compose.c:700
+#: src/compose.c:719
 msgid "Aut_o wrapping"
 msgstr ""
 
-#: src/compose.c:701
+#: src/compose.c:720
 msgid "Auto _indent"
 msgstr ""
 
-#: src/compose.c:702
+#: src/compose.c:721
 msgid "Si_gn"
 msgstr ""
 
-#: src/compose.c:703
+#: src/compose.c:722
 msgid "_Encrypt"
 msgstr ""
 
-#: src/compose.c:704
+#: src/compose.c:723
 msgid "_Request Return Receipt"
 msgstr ""
 
-#: src/compose.c:705
+#: src/compose.c:724
 msgid "Remo_ve references"
 msgstr ""
 
-#: src/compose.c:706
+#: src/compose.c:725
 msgid "Show _ruler"
 msgstr ""
 
-#: src/compose.c:711 src/compose.c:721
+#: src/compose.c:730 src/compose.c:740
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:712 src/mainwindow.c:664 src/messageview.c:302
+#: src/compose.c:731 src/mainwindow.c:666 src/messageview.c:305
+#: src/summaryview.c:430
 msgid "_All"
 msgstr ""
 
-#: src/compose.c:713 src/mainwindow.c:665 src/messageview.c:303
+#: src/compose.c:732 src/mainwindow.c:667 src/messageview.c:306
+#: src/summaryview.c:431
 msgid "_Sender"
 msgstr ""
 
-#: src/compose.c:714
+#: src/compose.c:733
 msgid "_Mailing-list"
 msgstr ""
 
-#: src/compose.c:719
+#: src/compose.c:738
 msgid "_Highest"
 msgstr ""
 
-#: src/compose.c:720
+#: src/compose.c:739
 msgid "Hi_gh"
 msgstr ""
 
-#: src/compose.c:722
+#: src/compose.c:741
 msgid "Lo_w"
 msgstr ""
 
-#: src/compose.c:723
+#: src/compose.c:742
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:728 src/mainwindow.c:878 src/messageview.c:351
+#: src/compose.c:747 src/mainwindow.c:879 src/messageview.c:353
 msgid "_Automatic"
 msgstr ""
 
-#: src/compose.c:729 src/mainwindow.c:879 src/messageview.c:352
+#: src/compose.c:748 src/mainwindow.c:880 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr ""
 
-#: src/compose.c:730 src/mainwindow.c:880 src/messageview.c:353
+#: src/compose.c:749 src/mainwindow.c:881 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr ""
 
-#: src/compose.c:734 src/mainwindow.c:884 src/messageview.c:357
+#: src/compose.c:753 src/mainwindow.c:885 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr ""
 
-#: src/compose.c:737 src/mainwindow.c:887 src/messageview.c:360
+#: src/compose.c:756 src/mainwindow.c:888 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr ""
 
-#: src/compose.c:742 src/mainwindow.c:892 src/messageview.c:365
+#: src/compose.c:761 src/mainwindow.c:893 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr ""
 
-#: src/compose.c:1071
+#: src/compose.c:1015 src/compose.c:1697
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+
+#: src/compose.c:1051
 msgid "New message From format error."
 msgstr ""
 
-#: src/compose.c:1163
+#: src/compose.c:1144
 msgid "New message subject format error."
 msgstr ""
 
-#: src/compose.c:1194 src/quote_fmt.c:569
+#: src/compose.c:1176 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1455
+#: src/compose.c:1445
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 
-#: src/compose.c:1638 src/quote_fmt.c:586
+#: src/compose.c:1630 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1686 src/quote_fmt.c:589
+#: src/compose.c:1679 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1822 src/compose.c:2014 src/quote_fmt.c:606
+#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1882 src/quote_fmt.c:609
+#: src/compose.c:1883 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2056
+#: src/compose.c:2059
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2539
+#: src/compose.c:2566
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2606 src/gtk/headers.h:14
+#: src/compose.c:2633 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2609 src/gtk/headers.h:15
+#: src/compose.c:2636 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2612 src/gtk/headers.h:12
+#: src/compose.c:2639 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2615 src/compose.c:4946 src/compose.c:4948
+#: src/compose.c:2642 src/compose.c:5006 src/compose.c:5008
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2618 src/gtk/headers.h:34
+#: src/compose.c:2645 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2621 src/gtk/headers.h:17
+#: src/compose.c:2648 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2625 src/compose.c:4943 src/compose.c:4951
-#: src/gtk/headers.h:13 src/summary_search.c:433
+#: src/compose.c:2652 src/compose.c:5003 src/compose.c:5011
+#: src/gtk/headers.h:13 src/summary_search.c:421
 msgid "To:"
 msgstr ""
 
-#: src/compose.c:2834
+#: src/compose.c:2842
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2840
+#: src/compose.c:2848
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1831,170 +1828,182 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3113
+#: src/compose.c:3128
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3613
+#: src/compose.c:3657
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3624
+#: src/compose.c:3675
 #, 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:3627
+#: src/compose.c:3678
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3628 src/compose.c:10535 src/compose.c:11402
+#: src/compose.c:3679 src/compose.c:10832 src/compose.c:11726
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3752
+#: src/compose.c:3804
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3753
+#: src/compose.c:3805
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3754
+#: src/compose.c:3806
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3763
+#: src/compose.c:3815
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3790
+#: src/compose.c:3842
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4783 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4847 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4790 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4854 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4793 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4857 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4795 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4822 src/messageview.c:889
+#: src/compose.c:4886 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:5042 src/compose.c:5074 src/compose.c:5116
-#: src/prefs_account.c:3323 src/toolbar.c:406 src/toolbar.c:424
-msgid "Send"
+#: src/compose.c:5103 src/compose.c:5140
+#, c-format
+msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5043
-msgid "The only recipient is the default CC address. Send anyway?"
+#: src/compose.c:5105 src/compose.c:5142 src/compose.c:5180 src/compose.c:5223
+#: src/prefs_account.c:3778 src/toolbar.c:487 src/toolbar.c:519
+msgid "Send"
 msgstr ""
 
-#: src/compose.c:5044 src/compose.c:5076 src/compose.c:5109 src/compose.c:5636
-#: src/folderview.c:2458 src/messageview.c:855 src/messageview.c:872
-#: src/plugins/attachwarner/attachwarner.c:210 src/toolbar.c:2629
+#: src/compose.c:5107 src/compose.c:5144 src/compose.c:5181 src/compose.c:5224
+#: src/compose.c:5786 src/folderview.c:2546 src/messageview.c:859
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr ""
 
-#: src/compose.c:5075
-msgid "The only recipient is the default BCC address. Send anyway?"
-msgstr ""
-
-#: src/compose.c:5092
+#: src/compose.c:5161
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5111 src/plugins/attachwarner/attachwarner.c:212
-msgid "_Queue"
-msgstr ""
-
-#: src/compose.c:5112
+#: src/compose.c:5176
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5113 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5177 src/compose.c:5220
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5114 src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5178 src/compose.c:5221
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5116 src/toolbar.c:425
+#: src/compose.c:5180 src/compose.c:5223 src/toolbar.c:520
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5169 src/compose.c:9999
+#: src/compose.c:5181 src/compose.c:5224
+msgid "_Queue"
+msgstr ""
+
+#: src/compose.c:5219
+#, c-format
+msgid "Sending to %d recipients. %s"
+msgstr ""
+
+#: src/compose.c:5248
+msgid "Could not queue message."
+msgstr ""
+
+#: src/compose.c:5251
+#, c-format
 msgid ""
-"Could not queue message for sending:\n"
+"Could not queue message:\n"
 "\n"
-"Charset conversion failed."
+"%s."
 msgstr ""
 
-#: src/compose.c:5172 src/compose.c:10002
+#: src/compose.c:5255
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Couldn't get recipient encryption key."
+"Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5178 src/compose.c:9996
+#: src/compose.c:5260
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed: %s"
+"Encryption failed: %s"
 msgstr ""
 
-#: src/compose.c:5181
-#, c-format
+#: src/compose.c:5265
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"%s."
+"Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5183
-msgid "Could not queue message for sending."
+#: src/compose.c:5269
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
 msgstr ""
 
-#: src/compose.c:5198 src/compose.c:5258
+#: src/compose.c:5329 src/compose.c:5389
 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:5254
+#: src/compose.c:5385
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5632
+#: src/compose.c:5782
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2002,7 +2011,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5690
+#: src/compose.c:5844
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2011,186 +2020,167 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5801
-#, c-format
-msgid "Couldn't encrypt the email: %s"
-msgstr ""
-
-#: src/compose.c:5922
+#: src/compose.c:6076
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:5923
+#: src/compose.c:6077
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:5972
+#: src/compose.c:6126
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:5981
+#: src/compose.c:6135
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6216
+#: src/compose.c:6389
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6217 src/mainwindow.c:655 src/toolbar.c:231 src/toolbar.c:2167
+#: src/compose.c:6391 src/mainwindow.c:657 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr ""
 
-#: src/compose.c:6217
+#: src/compose.c:6391
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6257
+#: src/compose.c:6447
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:6838
+#: src/compose.c:7047
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:6999
+#: src/compose.c:7214
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:7003 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7218 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
-#: src/compose.c:7218
+#: src/compose.c:7450
 msgid "Mime type"
 msgstr ""
 
-#: src/compose.c:7224 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:393
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:434
-#: src/prefs_summary_column.c:85 src/summaryview.c:444
+#: src/compose.c:7456 src/mimeview.c:274 src/plugins/pgpcore/select-keys.c:451
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:608
+#: src/prefs_summary_column.c:84 src/summaryview.c:455
 msgid "Size"
 msgstr ""
 
-#: src/compose.c:7287
+#: src/compose.c:7518
 msgid "Save Message to "
 msgstr ""
 
-#: src/compose.c:7324 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7549 src/editjpilot.c:276 src/editldap.c:517
 #: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1025
-#: src/plugins/bogofilter/bogofilter_gtk.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+#: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:299
-#: src/plugins/spamassassin/spamassassin_gtk.c:417
+#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/spamassassin/spamassassin_gtk.c:434
 msgid "_Browse"
 msgstr ""
 
-#: src/compose.c:7797
+#: src/compose.c:7565
+msgid "Select folder to save message to"
+msgstr ""
+
+#: src/compose.c:8022
 msgid "Hea_der"
 msgstr ""
 
-#: src/compose.c:7802
+#: src/compose.c:8027
 msgid "_Attachments"
 msgstr ""
 
-#: src/compose.c:7816
+#: src/compose.c:8041
 msgid "Othe_rs"
 msgstr ""
 
-#: src/compose.c:7831
+#: src/compose.c:8056
 msgid "S_ubject:"
 msgstr ""
 
-#: src/compose.c:8055
+#: src/compose.c:8280
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:8194
+#: src/compose.c:8427
 msgid "_From:"
 msgstr ""
 
-#: src/compose.c:8211
+#: src/compose.c:8444
 msgid "Account to use for this email"
 msgstr ""
 
-#: src/compose.c:8213
+#: src/compose.c:8446
 msgid "Sender address to be used"
 msgstr ""
 
-#: src/compose.c:8379
+#: src/compose.c:8628
 #, 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:8480 src/plugins/archive/archiver_gtk.c:1077
+#: src/compose.c:8739 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr ""
 
-#: src/compose.c:8581 src/prefs_template.c:760
+#: src/compose.c:8840 src/prefs_template.c:751
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:8697
-msgid "Template From format error."
-msgstr ""
-
-#: src/compose.c:8715
-msgid "Template To format error."
-msgstr ""
-
-#: src/compose.c:8733
-msgid "Template Cc format error."
-msgstr ""
-
-#: src/compose.c:8751
-msgid "Template Bcc format error."
-msgstr ""
-
-#: src/compose.c:8769
-msgid "Template Reply-To format error."
-msgstr ""
-
-#: src/compose.c:8788
-msgid "Template subject format error."
+#: src/compose.c:8937
+#, c-format
+msgctxt "'%s' stands for a header name"
+msgid "Template '%s' format error."
 msgstr ""
 
-#: src/compose.c:9057
+#: src/compose.c:9361
 msgid "Invalid MIME type."
 msgstr ""
 
-#: src/compose.c:9072
+#: src/compose.c:9376
 msgid "File doesn't exist or is empty."
 msgstr ""
 
-#: src/compose.c:9146
+#: src/compose.c:9450
 msgid "Properties"
 msgstr ""
 
-#: src/compose.c:9163
+#: src/compose.c:9467
 msgid "MIME type"
 msgstr ""
 
-#: src/compose.c:9204
+#: src/compose.c:9500
 msgid "Encoding"
 msgstr ""
 
-#: src/compose.c:9224
+#: src/compose.c:9520
 msgid "Path"
 msgstr ""
 
-#: src/compose.c:9225
+#: src/compose.c:9521
 msgid "File name"
 msgstr ""
 
-#: src/compose.c:9476
+#: src/compose.c:9780
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2198,123 +2188,116 @@ msgid ""
 "process group id: %d"
 msgstr ""
 
-#: src/compose.c:9965 src/messageview.c:1096
+#: src/compose.c:10253 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
-#: src/compose.c:9991
-msgid "Could not queue message."
-msgstr ""
-
-#: src/compose.c:9993
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-
-#: src/compose.c:10171
+#: src/compose.c:10446
 msgid "Could not save draft."
 msgstr ""
 
-#: src/compose.c:10175
+#: src/compose.c:10450
 msgid "Could not save draft"
 msgstr ""
 
-#: src/compose.c:10176
+#: src/compose.c:10451
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: src/compose.c:10178
+#: src/compose.c:10453
 msgid "_Cancel exit"
 msgstr ""
 
-#: src/compose.c:10178
+#: src/compose.c:10453
 msgid "_Discard email"
 msgstr ""
 
-#: src/compose.c:10338 src/compose.c:10352
+#: src/compose.c:10642 src/compose.c:10656
 msgid "Select file"
 msgstr ""
 
-#: src/compose.c:10366
+#: src/compose.c:10670
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
-#: src/compose.c:10368
+#: src/compose.c:10672
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: src/compose.c:10455
+#: src/compose.c:10751
 msgid "Discard message"
 msgstr ""
 
-#: src/compose.c:10456
+#: src/compose.c:10752
 msgid "This message has been modified. Discard it?"
 msgstr ""
 
-#: src/compose.c:10457 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10753 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr ""
 
-#: src/compose.c:10457 src/compose.c:10461
+#: src/compose.c:10753 src/compose.c:10758
 msgid "_Save to Drafts"
 msgstr ""
 
-#: src/compose.c:10459 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10756 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr ""
 
-#: src/compose.c:10460
+#: src/compose.c:10757
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/compose.c:10461
+#: src/compose.c:10758
 msgid "_Don't save"
 msgstr ""
 
-#: src/compose.c:10532
+#: src/compose.c:10829
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr ""
 
-#: src/compose.c:10534
+#: src/compose.c:10831
 msgid "Apply template"
 msgstr ""
 
-#: src/compose.c:10535 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:773 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1050
+#: src/compose.c:10832 src/prefs_actions.c:330 src/prefs_filtering_action.c:582
+#: src/prefs_filtering.c:477 src/prefs_matcher.c:794 src/prefs_template.c:310
+#: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr ""
 
-#: src/compose.c:11399
-msgid "Insert or attach?"
-msgstr ""
-
-#: src/compose.c:11400
+#: src/compose.c:11719
+#, c-format
 msgid ""
-"Do you want to insert the contents of the file(s) into the message body, or "
+"Do you want to insert the contents of the file into the message body, or "
 "attach it to the email?"
+msgid_plural ""
+"Do you want to insert the contents of the %d files into the message body, or "
+"attach them to the email?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/compose.c:11725
+msgid "Insert or attach?"
 msgstr ""
 
-#: src/compose.c:11402
+#: src/compose.c:11726
 msgid "_Attach"
 msgstr ""
 
-#: src/compose.c:11619
+#: src/compose.c:11944
 #, c-format
 msgid "Quote format error at line %d."
 msgstr ""
 
-#: src/compose.c:11914
+#: src/compose.c:12240
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2341,7 +2324,7 @@ msgstr ""
 msgid "Debug log"
 msgstr ""
 
-#: src/crash.c:251 src/toolbar.c:422
+#: src/crash.c:251 src/toolbar.c:539
 msgid "Close"
 msgstr ""
 
@@ -2357,11 +2340,11 @@ msgstr ""
 msgid "Save crash information"
 msgstr ""
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:150 src/editaddress.c:288
 msgid "Add New Person"
 msgstr ""
 
-#: src/editaddress.c:157
+#: src/editaddress.c:152
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2376,7 +2359,7 @@ msgid ""
 "Click Cancel to close without saving."
 msgstr ""
 
-#: src/editaddress.c:168
+#: src/editaddress.c:163
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2389,93 +2372,93 @@ msgid ""
 "Click Cancel to close without saving."
 msgstr ""
 
-#: src/editaddress.c:232
+#: src/editaddress.c:289
 msgid "Edit Person Details"
 msgstr ""
 
-#: src/editaddress.c:410
+#: src/editaddress.c:507
 msgid "An Email address must be supplied."
 msgstr ""
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 msgid "A Name and Value must be supplied."
 msgstr ""
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1675
+#: src/editaddress.c:820 src/prefs_folder_item.c:1784
 msgid "Discard"
 msgstr ""
 
-#: src/editaddress.c:676
+#: src/editaddress.c:821
 msgid "Apply"
 msgstr ""
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:851 src/editaddress.c:900
 msgid "Edit Person Data"
 msgstr ""
 
-#: src/editaddress.c:784
+#: src/editaddress.c:929
 msgid "Choose a picture"
 msgstr ""
 
-#: src/editaddress.c:803
+#: src/editaddress.c:948
 #, c-format
 msgid ""
 "Failed to import image: \n"
 "%s"
 msgstr ""
 
-#: src/editaddress.c:845
+#: src/editaddress.c:990
 msgid "_Set picture"
 msgstr ""
 
-#: src/editaddress.c:846
+#: src/editaddress.c:991
 msgid "_Unset picture"
 msgstr ""
 
-#: src/editaddress.c:904
+#: src/editaddress.c:1049
 msgid "Photo"
 msgstr ""
 
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:1096 src/editaddress.c:1098 src/expldifdlg.c:516
+#: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr ""
 
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:1107 src/editaddress.c:1111 src/ldif.c:755
 msgid "Last Name"
 msgstr ""
 
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:1108 src/editaddress.c:1110 src/ldif.c:751
 msgid "First Name"
 msgstr ""
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:1114 src/editaddress.c:1116
 msgid "Nickname"
 msgstr ""
 
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1252 src/editaddress.c:1293
 msgid "Alias"
 msgstr ""
 
-#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
-#: src/editaddress_other_attributes_ldap.c:303
-#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:222
+#: src/editaddress.c:1478 src/editaddress.c:1511 src/editaddress.c:1527
+#: src/editaddress_other_attributes_ldap.c:376
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:222
 msgid "Value"
 msgstr ""
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1593
 msgid "_User Data"
 msgstr ""
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1594
 msgid "_Email Addresses"
 msgstr ""
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1597 src/editaddress.c:1600
 msgid "O_ther Attributes"
 msgstr ""
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1768
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2503,8 +2486,8 @@ msgid " Check File "
 msgstr ""
 
 #: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:1976
-#: src/wizard.c:1197 src/wizard.c:1617
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2178
+#: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr ""
 
@@ -2516,19 +2499,19 @@ msgstr ""
 msgid "A Group Name must be supplied."
 msgstr ""
 
-#: src/editgroup.c:294
+#: src/editgroup.c:296
 msgid "Edit Group Data"
 msgstr ""
 
-#: src/editgroup.c:323 src/exporthtml.c:597
+#: src/editgroup.c:325 src/exporthtml.c:598
 msgid "Group Name"
 msgstr ""
 
-#: src/editgroup.c:342
+#: src/editgroup.c:344
 msgid "Addresses in Group"
 msgstr ""
 
-#: src/editgroup.c:377
+#: src/editgroup.c:378
 msgid "Available Addresses"
 msgstr ""
 
@@ -2552,12 +2535,12 @@ msgstr ""
 msgid "Input the new name of folder:"
 msgstr ""
 
-#: src/editgroup.c:556 src/foldersel.c:582 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:570 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
 msgid "New folder"
 msgstr ""
 
-#: src/editgroup.c:557 src/foldersel.c:583 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:571 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "Input the name of new folder:"
 msgstr ""
@@ -2582,32 +2565,34 @@ msgstr ""
 msgid "Add New JPilot Entry"
 msgstr ""
 
-#: src/editldap_basedn.c:137
+#: src/editldap_basedn.c:153
 msgid "Edit LDAP - Select Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:156 src/editldap.c:441
+#: src/editldap_basedn.c:172 src/editldap.c:440 src/prefs_account.c:2930
+#: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr ""
 
-#: src/editldap_basedn.c:166 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:389 src/ssl_manager.c:108
+#: src/editldap_basedn.c:182 src/editldap.c:457
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2937
+#: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr ""
 
-#: src/editldap_basedn.c:176 src/editldap.c:502
+#: src/editldap_basedn.c:192 src/editldap.c:501
 msgid "Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:197
+#: src/editldap_basedn.c:220
 msgid "Available Search Base(s)"
 msgstr ""
 
-#: src/editldap_basedn.c:287
+#: src/editldap_basedn.c:326
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 
-#: src/editldap_basedn.c:291 src/editldap.c:281
+#: src/editldap_basedn.c:330 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr ""
 
@@ -2627,61 +2612,62 @@ msgstr ""
 msgid "Connected successfully to server"
 msgstr ""
 
-#: src/editldap.c:336 src/editldap.c:970
+#: src/editldap.c:335 src/editldap.c:990
 msgid "Edit LDAP Server"
 msgstr ""
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr ""
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
-"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
-"be appropriate for the \"mydomain.com\" organization. An IP address may also "
-"be used. You may specify \"localhost\" if running an LDAP server on the same "
+"This is the hostname of the server. For example, \"ldap.example.org\" may be "
+"appropriate for the \"example.org\" organization. An IP address may also be "
+"used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 msgstr ""
-"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
-"be appropriate for the \"mydomain.com\" organisation. An IP address may also "
-"be used. You may specify \"localhost\" if running an LDAP server on the same "
+"This is the hostname of the server. For example, \"ldap.example.org\" may be "
+"appropriate for the \"example.org\" organisation. An IP address may also be "
+"used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 
-#: src/editldap.c:470
-msgid "TLS"
+#: src/editldap.c:468
+msgid "STARTTLS"
 msgstr ""
 
-#: src/editldap.c:471 src/prefs_account.c:3396
-msgid "SSL"
+#: src/editldap.c:469 src/prefs_account.c:3851
+msgid "SSL/TLS"
 msgstr ""
 
-#: src/editldap.c:475
+#: src/editldap.c:473
 msgid ""
-"Enable secure connection to the LDAP server via TLS. If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
+"Enable secure connection to the LDAP server via STARTTLS. Connection starts "
+"unencrypted and is secured by STARTTLS command. If connection fails, be sure "
+"to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
 "TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:479
+#: src/editldap.c:478
 msgid ""
-"Enable secure connection to the LDAP server via SSL. If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
-"TLS_REQCERT fields)."
+"Enable secure connection to the LDAP server via SSL/TLS. If connection "
+"fails, be sure to check the correct configuration in ldap.conf "
+"(TLS_CACERTDIR and TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:491
+#: src/editldap.c:490
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 
-#: src/editldap.c:494
+#: src/editldap.c:493
 msgid " Check Server "
 msgstr ""
 
-#: src/editldap.c:498
+#: src/editldap.c:497
 msgid "Press this button to test the connection to the server."
 msgstr ""
 
-#: src/editldap.c:511
+#: src/editldap.c:510
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2695,37 +2681,37 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organisation Name,c=Country\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:521
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr ""
 
-#: src/editldap.c:578
+#: src/editldap.c:577
 msgid "Search Attributes"
 msgstr ""
 
-#: src/editldap.c:587
+#: src/editldap.c:586
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr ""
 
-#: src/editldap.c:590
+#: src/editldap.c:589
 msgid " Defaults "
 msgstr ""
 
-#: src/editldap.c:594
+#: src/editldap.c:593
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
 
-#: src/editldap.c:600
+#: src/editldap.c:599
 msgid "Max Query Age (secs)"
 msgstr ""
 
-#: src/editldap.c:615
+#: src/editldap.c:613
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2739,21 +2725,21 @@ msgid ""
 "more memory to cache results."
 msgstr ""
 
-#: src/editldap.c:632
+#: src/editldap.c:630
 msgid "Include server in dynamic search"
 msgstr ""
 
-#: src/editldap.c:637
+#: src/editldap.c:635
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr ""
 
-#: src/editldap.c:643
+#: src/editldap.c:641
 msgid "Match names 'containing' search term"
 msgstr ""
 
-#: src/editldap.c:648
+#: src/editldap.c:646
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2762,11 +2748,11 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 
-#: src/editldap.c:701
+#: src/editldap.c:709
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:710
+#: src/editldap.c:718
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2774,82 +2760,88 @@ msgid ""
 "performing a search."
 msgstr ""
 
-#: src/editldap.c:717
+#: src/editldap.c:725
 msgid "Bind Password"
 msgstr ""
 
-#: src/editldap.c:727
+#: src/editldap.c:735
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 
-#: src/editldap.c:732
+#: src/editldap.c:738 src/prefs_account.c:1402 src/prefs_account.c:2023
+#: src/prefs_account.c:2742 src/prefs_account.c:2770 src/prefs_account.c:2975
+#: src/prefs_proxy.c:146
+msgid "Show password"
+msgstr ""
+
+#: src/editldap.c:747
 msgid "Timeout (secs)"
 msgstr ""
 
-#: src/editldap.c:746
+#: src/editldap.c:760
 msgid "The timeout period in seconds."
 msgstr ""
 
-#: src/editldap.c:750
+#: src/editldap.c:764
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:764
+#: src/editldap.c:777
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:779 src/prefs_account.c:3287
+#: src/editldap.c:792 src/prefs_account.c:3742
 msgid "Basic"
 msgstr ""
 
-#: src/editldap.c:781 src/gtk/quicksearch.c:680
+#: src/editldap.c:794 src/gtk/quicksearch.c:706
 msgid "Extended"
 msgstr ""
 
-#: src/editldap.c:975
+#: src/editldap.c:995
 msgid "Add New LDAP Server"
 msgstr ""
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1446
-#: src/prefs_summaries.c:441
+#: src/edittags.c:192 src/prefs_filtering_action.c:1402
+#: src/prefs_summaries.c:615
 msgid "Tag"
 msgstr ""
 
-#: src/edittags.c:216
+#: src/edittags.c:221
 msgid "Delete tag"
 msgstr ""
 
-#: src/edittags.c:217
+#: src/edittags.c:222
 msgid "Do you really want to delete this tag?"
 msgstr ""
 
-#: src/edittags.c:244
+#: src/edittags.c:257
 msgid "Delete all tags"
 msgstr ""
 
-#: src/edittags.c:245
+#: src/edittags.c:258
 msgid "Do you really want to delete all tags?"
 msgstr ""
 
-#: src/edittags.c:416
+#: src/edittags.c:430
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
 
-#: src/edittags.c:458
+#: src/edittags.c:472
 msgid "Tag is not set."
 msgstr ""
 
-#: src/edittags.c:523
+#: src/edittags.c:537
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr ""
 
-#: src/edittags.c:537
+#: src/edittags.c:551
 msgid "New tag:"
 msgstr ""
 
-#: src/edittags.c:570
+#: src/edittags.c:584
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 
@@ -2873,6 +2865,14 @@ msgstr ""
 msgid "Impossible to set the client certificate.\n"
 msgstr ""
 
+#: src/etpan/nntp-thread.c:939
+msgid "couldn't get xover range\n"
+msgstr ""
+
+#: src/etpan/nntp-thread.c:1038
+msgid "couldn't get xhdr range\n"
+msgstr ""
+
 #: src/exphtmldlg.c:105
 msgid "Please specify output directory and file to create."
 msgstr ""
@@ -2920,29 +2920,30 @@ msgid "HTML Output File"
 msgstr ""
 
 #: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
-#: src/importldif.c:684
+#: src/importldif.c:568
 msgid "B_rowse"
 msgstr ""
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
 msgid "Stylesheet"
 msgstr ""
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:406 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2231 src/gtk/menu.c:125 src/mainwindow.c:1188
-#: src/plugins/archive/archiver_prefs.c:235
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:941
-#: src/prefs_toolbar.c:780 src/prefs_toolbar.c:1466 src/summaryview.c:5992
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:123 src/mainwindow.c:1170
+#: src/plugins/archive/archiver_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1037
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6210
 msgid "None"
 msgstr ""
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:505 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/prefs_other.c:127 src/prefs_other.c:415
 msgid "Default"
 msgstr ""
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:243
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr ""
 
@@ -2986,11 +2987,11 @@ msgstr ""
 msgid "Format User Attributes"
 msgstr ""
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
 msgid "Address Book:"
 msgstr ""
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
 msgid "File Name:"
 msgstr ""
 
@@ -3002,7 +3003,7 @@ msgstr ""
 msgid "Export Address Book to HTML File"
 msgstr ""
 
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
+#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:979
 msgid "File Info"
 msgstr ""
 
@@ -3150,7 +3151,7 @@ msgstr ""
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/export.c:113 src/summaryview.c:8139
+#: src/export.c:113 src/summaryview.c:8383
 msgid "Export to mbox file"
 msgstr ""
 
@@ -3182,46 +3183,50 @@ msgstr ""
 msgid "Select exporting file"
 msgstr ""
 
-#: src/exporthtml.c:767
+#: src/export.c:268
+msgid "Select folder to export"
+msgstr ""
+
+#: src/exporthtml.c:768
 msgid "Full Name"
 msgstr ""
 
-#: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:735
+#: src/exporthtml.c:772 src/importldif.c:980
+#: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr ""
 
-#: src/exporthtml.c:974
+#: src/exporthtml.c:975
 msgid "Claws Mail Address Book"
 msgstr ""
 
-#: src/exporthtml.c:1069 src/exportldif.c:606
+#: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr ""
 
-#: src/exporthtml.c:1072 src/exportldif.c:609
+#: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr ""
 
-#: src/exporthtml.c:1075 src/exportldif.c:612
+#: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
 msgstr ""
 
-#: src/exporthtml.c:1078 src/exportldif.c:615
+#: src/exporthtml.c:1079 src/exportldif.c:616
 msgid "Not specified."
 msgstr ""
 
-#: src/file_checker.c:76
+#: src/file_checker.c:77
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr ""
 
-#: src/file_checker.c:84 src/file_checker.c:106
+#: src/file_checker.c:86 src/file_checker.c:109
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr ""
 
-#: src/file_checker.c:98
+#: src/file_checker.c:100
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3311,51 +3316,51 @@ msgstr ""
 msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:810
+#: src/filtering.c:809
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:814
+#: src/filtering.c:813
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:832
+#: src/filtering.c:831
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:836
+#: src/filtering.c:835
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:874
+#: src/filtering.c:873
 msgid "undetermined"
 msgstr ""
 
-#: src/filtering.c:878
+#: src/filtering.c:877
 msgid "incorporation"
 msgstr ""
 
-#: src/filtering.c:882
+#: src/filtering.c:881
 msgid "manually"
 msgstr ""
 
-#: src/filtering.c:886
+#: src/filtering.c:885
 msgid "folder processing"
 msgstr ""
 
-#: src/filtering.c:890
+#: src/filtering.c:889
 msgid "pre-processing"
 msgstr ""
 
-#: src/filtering.c:894
+#: src/filtering.c:893
 msgid "post-processing"
 msgstr ""
 
-#: src/filtering.c:911
+#: src/filtering.c:908
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3366,322 +3371,346 @@ msgid ""
 "%s%s %s\n"
 msgstr ""
 
-#: src/filtering.c:913 src/filtering.c:922
+#: src/filtering.c:910 src/filtering.c:919
 msgid ": "
 msgstr ""
 
-#: src/filtering.c:920
+#: src/filtering.c:917
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
 
-#: src/folder.c:1565 src/foldersel.c:400 src/prefs_folder_item.c:300
+#: src/folder.c:1595 src/prefs_folder_item.c:319
 msgid "Inbox"
 msgstr ""
 
-#: src/folder.c:1569 src/foldersel.c:404
+#: src/folder.c:1599
 msgid "Sent"
 msgstr ""
 
-#: src/folder.c:1573 src/foldersel.c:408 src/prefs_folder_item.c:303
+#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:322
 msgid "Queue"
 msgstr ""
 
-#: src/folder.c:1577 src/foldersel.c:412 src/prefs_folder_item.c:304
+#: src/folder.c:1607 src/prefs_folder_item.c:323
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/folder.c:1581 src/foldersel.c:416 src/prefs_folder_item.c:302
+#: src/folder.c:1611 src/prefs_folder_item.c:321
 msgid "Drafts"
 msgstr ""
 
-#: src/folder.c:2012
+#: src/folder.c:2042
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 
-#: src/folder.c:3257
+#: src/folder.c:3287
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3257
+#: src/folder.c:3287
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3563
+#: src/folder.c:3597
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4424
+#: src/folder.c:4459
 msgid "Processing messages..."
 msgstr ""
 
-#: src/folder.c:4559
+#: src/folder.c:4594
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr ""
 
-#: src/folder.c:4816
+#: src/folder.c:4853
 msgid "A folder name cannot begin or end with a dot."
 msgstr ""
 
-#: src/folder.c:4820
+#: src/folder.c:4857
 msgid "A folder name can not end with a space."
 msgstr ""
 
-#: src/foldersel.c:247
+#: src/foldersel.c:249
 msgid "Select folder"
 msgstr ""
 
-#: src/foldersel.c:584 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:572 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "NewFolder"
 msgstr ""
 
-#: src/foldersel.c:592 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:580 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:422
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2056
+#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/rssyl/rssyl_cb_menu.c:201
+#: src/plugins/vcalendar/vcal_folder.c:2065
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
-#: src/foldersel.c:607 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:595 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:434 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2063
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:213
+#: src/plugins/vcalendar/vcal_folder.c:2072
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
-#: src/foldersel.c:614 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:602 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:124
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 
-#: src/folderview.c:241
+#: src/folderview.c:246
 msgid "Mark all re_ad"
 msgstr ""
 
-#: src/folderview.c:242
+#: src/folderview.c:247
+msgid "Mark all u_nread"
+msgstr ""
+
+#: src/folderview.c:248
 msgid "Mark all read recursi_vely"
 msgstr ""
 
-#: src/folderview.c:244
+#: src/folderview.c:249
+msgid "Mark all unread recursi_vely"
+msgstr ""
+
+#: src/folderview.c:251
 msgid "R_un processing rules"
 msgstr ""
 
-#: src/folderview.c:245 src/mainwindow.c:551
+#: src/folderview.c:252 src/mainwindow.c:554
 msgid "_Search folder..."
 msgstr ""
 
-#: src/folderview.c:247
+#: src/folderview.c:254
 msgid "Process_ing..."
 msgstr ""
 
-#: src/folderview.c:248
+#: src/folderview.c:255
 msgid "Empty _trash..."
 msgstr "Empty was_tebin..."
 
-#: src/folderview.c:249
+#: src/folderview.c:256
 msgid "Send _queue..."
 msgstr ""
 
-#: src/folderview.c:389 src/folderview.c:436
+#: src/folderview.c:396 src/folderview.c:443
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:393 src/summaryview.c:6266
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6484
 msgid "New"
 msgstr ""
 
-#: src/folderview.c:390 src/folderview.c:437
+#: src/folderview.c:397 src/folderview.c:444
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:80 src/prefs_matcher.c:392 src/summaryview.c:6268
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6486
+#: src/toolbar.c:512
 msgid "Unread"
 msgstr ""
 
-#: src/folderview.c:391 src/plugins/notification/notification_lcdproc.c:149
-#: src/prefs_folder_column.c:81
+#: src/folderview.c:398 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:439 src/summaryview.c:445
+#: src/folderview.c:446 src/summaryview.c:456
 msgid "#"
 msgstr "No."
 
-#: src/folderview.c:773
+#: src/folderview.c:780
 msgid "Setting folder info..."
 msgstr ""
 
-#: src/folderview.c:845
+#: src/folderview.c:865 src/summaryview.c:4248
+msgid "Mark all as read"
+msgstr ""
+
+#: src/folderview.c:866
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr ""
 
-#: src/folderview.c:847 src/summaryview.c:4115
+#: src/folderview.c:868 src/summaryview.c:4249
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 
-#: src/folderview.c:851 src/summaryview.c:4114
-msgid "Mark all as read"
+#: src/folderview.c:871 src/summaryview.c:4294
+msgid "Mark all as unread"
+msgstr ""
+
+#: src/folderview.c:872
+msgid ""
+"Do you really want to mark all mails in this folder and its sub-folders as "
+"unread?"
+msgstr ""
+
+#: src/folderview.c:874 src/summaryview.c:4295
+msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 
-#: src/folderview.c:1027 src/imap.c:4639
+#: src/folderview.c:1064 src/imap.c:4628
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr ""
 
-#: src/folderview.c:1030 src/imap.c:4643 src/mainwindow.c:5193 src/setup.c:96
+#: src/folderview.c:1067 src/imap.c:4632 src/mainwindow.c:5241 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr ""
 
-#: src/folderview.c:1061
+#: src/folderview.c:1098
 msgid "Rebuild folder tree"
 msgstr ""
 
-#: src/folderview.c:1062
+#: src/folderview.c:1099
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
-#: src/folderview.c:1072
+#: src/folderview.c:1109
 msgid "Rebuilding folder tree..."
 msgstr ""
 
-#: src/folderview.c:1074
+#: src/folderview.c:1111
 msgid "Scanning folder tree..."
 msgstr ""
 
-#: src/folderview.c:1165
+#: src/folderview.c:1202
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
-#: src/folderview.c:1219
+#: src/folderview.c:1256
 msgid "Checking for new messages in all folders..."
 msgstr ""
 
-#: src/folderview.c:2144
+#: src/folderview.c:2231
 #, c-format
 msgid "Closing folder %s..."
 msgstr ""
 
-#: src/folderview.c:2239
+#: src/folderview.c:2326
 #, c-format
 msgid "Opening folder %s..."
 msgstr ""
 
-#: src/folderview.c:2257
+#: src/folderview.c:2344
 msgid "Folder could not be opened."
 msgstr ""
 
-#: src/folderview.c:2399 src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/folderview.c:2486 src/mainwindow.c:2878 src/mainwindow.c:2883
 msgid "Empty trash"
 msgstr "Empty wastebin"
 
-#: src/folderview.c:2400
+#: src/folderview.c:2487
 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2488
 msgid "_Empty trash"
 msgstr "_Empty wastebin"
 
-#: src/folderview.c:2444 src/inc.c:1533 src/toolbar.c:2607
+#: src/folderview.c:2532 src/inc.c:1660 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr ""
 
-#: src/folderview.c:2445 src/toolbar.c:2608
+#: src/folderview.c:2533 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr ""
 
-#: src/folderview.c:2456 src/toolbar.c:2627
+#: src/folderview.c:2544 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr ""
 
-#: src/folderview.c:2457 src/toolbar.c:2628
+#: src/folderview.c:2545 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr ""
 
-#: src/folderview.c:2466 src/toolbar.c:2647
+#: src/folderview.c:2554 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
-#: src/folderview.c:2469 src/main.c:2743 src/toolbar.c:2650
+#: src/folderview.c:2557 src/main.c:2785 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
-#: src/folderview.c:2544
+#: src/folderview.c:2632
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr ""
 
-#: src/folderview.c:2545
+#: src/folderview.c:2633
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr ""
 
-#: src/folderview.c:2547
+#: src/folderview.c:2635
 msgid "Copy folder"
 msgstr ""
 
-#: src/folderview.c:2547
+#: src/folderview.c:2635
 msgid "Move folder"
 msgstr ""
 
-#: src/folderview.c:2558
+#: src/folderview.c:2646
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2558
+#: src/folderview.c:2646
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2592
+#: src/folderview.c:2680
 msgid "Source and destination are the same."
 msgstr ""
 
-#: src/folderview.c:2595
+#: src/folderview.c:2683
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2596
+#: src/folderview.c:2684
 msgid "Can't move a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2599
+#: src/folderview.c:2687
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 
-#: src/folderview.c:2602
+#: src/folderview.c:2690
 msgid "Copy failed!"
 msgstr ""
 
-#: src/folderview.c:2602
+#: src/folderview.c:2690
 msgid "Move failed!"
 msgstr ""
 
-#: src/folderview.c:2652
+#: src/folderview.c:2740
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
-#: src/folderview.c:3081 src/summaryview.c:4553 src/summaryview.c:4658
+#: src/folderview.c:3179 src/summaryview.c:4703 src/summaryview.c:4809
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 
@@ -3705,7 +3734,7 @@ msgstr ""
 msgid "Newsgroup name"
 msgstr ""
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:171
+#: src/grouplistdialog.c:205 src/prefs_send.c:188
 msgid "Messages"
 msgstr ""
 
@@ -3713,272 +3742,259 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:346
 msgid "moderated"
 msgstr ""
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:348
 msgid "readonly"
 msgstr ""
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:297
-#: src/plugins/vcalendar/vcal_manager.c:113
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/plugins/vcalendar/vcal_manager.c:115
+#: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr ""
 
-#: src/grouplistdialog.c:422
+#: src/grouplistdialog.c:421
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1916 src/summaryview.c:1565
+#: src/grouplistdialog.c:458 src/gtk/gtkutils.c:1857 src/summaryview.c:1637
 msgid "Done."
 msgstr ""
 
-#: src/grouplistdialog.c:492
+#: src/grouplistdialog.c:491
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 
-#: src/gtk/about.c:131
-msgid ""
-"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Claws Mail website:\n"
+#: src/gtk/about.c:133
+msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
+msgstr ""
+
+#: src/gtk/about.c:136
+msgid "For further information visit the Claws Mail website:"
 msgstr ""
 
-#: src/gtk/about.c:137
+#: src/gtk/about.c:141
 msgid ""
-"\n"
-"\n"
-"For support and discussion subscribe to the Claws Mail users' mailing list:\n"
+"For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr ""
 
-#: src/gtk/about.c:142
+#: src/gtk/about.c:147
 msgid ""
-"\n"
-"\n"
 "Claws Mail is free software released under the GPL. If you wish to donate to "
-"the Claws Mail project you can do so at:\n"
+"the Claws Mail project you can do so at:"
 msgstr ""
 
-#: src/gtk/about.c:158
+#: src/gtk/about.c:163 src/gtk/about.c:851
 msgid ""
-"\n"
-"\n"
-"Copyright (C) 1999-2016\n"
+"Copyright (C) 1999-2018\n"
 "The Claws Mail Team\n"
-" and Hiroyuki Yamamoto"
+"and Hiroyuki Yamamoto"
 msgstr ""
 
-#: src/gtk/about.c:161
-msgid ""
-"\n"
-"\n"
-"System Information\n"
+#: src/gtk/about.c:168
+msgid "System Information\n"
 msgstr ""
 
-#: src/gtk/about.c:168
+#: src/gtk/about.c:174
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s %s (%s)"
 msgstr ""
 
-#: src/gtk/about.c:177
+#: src/gtk/about.c:183
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: %s"
 msgstr ""
 
-#: src/gtk/about.c:186
+#: src/gtk/about.c:192
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
 
-#: src/gtk/about.c:242 src/prefs_themes.c:705 src/wizard.c:527
+#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr ""
 
-#: src/gtk/about.c:261
+#: src/gtk/about.c:267
 msgid "Previous team members"
 msgstr ""
 
-#: src/gtk/about.c:280
+#: src/gtk/about.c:286
 msgid "The translation team"
 msgstr ""
 
-#: src/gtk/about.c:299
+#: src/gtk/about.c:305
 msgid "Documentation team"
 msgstr ""
 
-#: src/gtk/about.c:318
+#: src/gtk/about.c:323
 msgid "Logo"
 msgstr ""
 
-#: src/gtk/about.c:337
+#: src/gtk/about.c:342
 msgid "Icons"
 msgstr ""
 
-#: src/gtk/about.c:356
+#: src/gtk/about.c:361
 msgid "Contributors"
 msgstr ""
 
-#: src/gtk/about.c:404
-msgid "Compiled-in Features\n"
+#: src/gtk/about.c:409
+msgid "Compiled-in Features"
 msgstr ""
 
-#: src/gtk/about.c:420
+#: src/gtk/about.c:426
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr ""
 
-#: src/gtk/about.c:430
+#: src/gtk/about.c:436
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr ""
 
-#: src/gtk/about.c:440
+#: src/gtk/about.c:446
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr ""
 
-#: src/gtk/about.c:450
+#: src/gtk/about.c:456
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
 
-#: src/gtk/about.c:461
+#: src/gtk/about.c:467
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr ""
 
-#: src/gtk/about.c:471
+#: src/gtk/about.c:477
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:481
+#: src/gtk/about.c:487
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:491
+#: src/gtk/about.c:497
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr ""
 
-#: src/gtk/about.c:501
+#: src/gtk/about.c:507
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr ""
 
-#: src/gtk/about.c:511
+#: src/gtk/about.c:517
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr ""
 
-#: src/gtk/about.c:543
+#: src/gtk/about.c:527
+msgctxt "librSVG"
+msgid "adds support for SVG themes\n"
+msgstr ""
+
+#: src/gtk/about.c:559
 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.\n"
-"\n"
+"Software Foundation; either version 3, or (at your option) any later version."
 msgstr ""
 
-#: src/gtk/about.c:549
+#: src/gtk/about.c:566
 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 "
 "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
+"more details."
 msgstr ""
 
-#: src/gtk/about.c:567
+#: src/gtk/about.c:585
 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:698 src/main.c:2567
+#: src/gtk/about.c:718 src/main.c:2609
 msgid "Session statistics\n"
 msgstr ""
 
-#: src/gtk/about.c:708 src/gtk/about.c:711 src/main.c:2577 src/main.c:2580
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2619 src/main.c:2622
 #, c-format
 msgid "Started: %s\n"
 msgstr ""
 
-#: src/gtk/about.c:718 src/main.c:2586
+#: src/gtk/about.c:738 src/main.c:2628
 msgid "Incoming traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:721 src/main.c:2589
+#: src/gtk/about.c:741 src/main.c:2631
 #, c-format
 msgid "Received messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:728 src/main.c:2595
+#: src/gtk/about.c:748 src/main.c:2637
 msgid "Outgoing traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:731 src/main.c:2598
+#: src/gtk/about.c:751 src/main.c:2640
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:736 src/main.c:2602
+#: src/gtk/about.c:756 src/main.c:2644
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:741 src/main.c:2606
+#: src/gtk/about.c:761 src/main.c:2648
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:746 src/main.c:2610
+#: src/gtk/about.c:766 src/main.c:2652
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:773
+#: src/gtk/about.c:793
 msgid "About Claws Mail"
 msgstr ""
 
-#: src/gtk/about.c:831
-msgid ""
-"Copyright (C) 1999-2016\n"
-"The Claws Mail Team\n"
-"and Hiroyuki Yamamoto"
-msgstr ""
-
-#: src/gtk/about.c:845
+#: src/gtk/about.c:865
 msgid "_Info"
 msgstr ""
 
-#: src/gtk/about.c:851
+#: src/gtk/about.c:871
 msgid "_Authors"
 msgstr ""
 
-#: src/gtk/about.c:857
+#: src/gtk/about.c:877
 msgid "_Features"
 msgstr ""
 
-#: src/gtk/about.c:863
+#: src/gtk/about.c:883
 msgid "_License"
 msgstr ""
 
-#: src/gtk/about.c:871
+#: src/gtk/about.c:891
 msgid "_Release Notes"
 msgstr ""
 
-#: src/gtk/about.c:877
+#: src/gtk/about.c:897
 msgid "_Statistics"
 msgstr ""
 
@@ -4042,15 +4058,15 @@ msgstr ""
 msgid "Magenta"
 msgstr ""
 
-#: src/gtk/foldersort.c:156
+#: src/gtk/foldersort.c:231
 msgid "Set mailbox order"
 msgstr ""
 
-#: src/gtk/foldersort.c:190
+#: src/gtk/foldersort.c:265
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 
-#: src/gtk/foldersort.c:216
+#: src/gtk/foldersort.c:299
 msgid "Mailboxes"
 msgstr ""
 
@@ -4076,25 +4092,21 @@ msgstr ""
 msgid "No misspelled word found."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1451
 msgid "Replace unknown word"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1460
+#: src/gtk/gtkaspell.c:1467
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1503
+#: src/gtk/gtkaspell.c:1510
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1800
-msgid "Change to..."
-msgstr ""
-
 #: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr ""
@@ -4139,44 +4151,44 @@ msgstr ""
 msgid "Use both dictionaries"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:144
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2153
+#: src/gtk/gtkaspell.c:2154
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2209
+#: src/gtk/gtkaspell.c:2210
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
 "%s"
 msgstr ""
 
-#: src/gtk/gtkutils.c:1921
+#: src/gtk/gtkutils.c:1862
 msgid "Failed: no service record found."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1924
+#: src/gtk/gtkutils.c:1865
 msgid "Failed: network error."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1927
+#: src/gtk/gtkutils.c:1868
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1997
+#: src/gtk/gtkutils.c:1938
 msgid "Configuring..."
 msgstr ""
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:435
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:49 src/summaryview.c:443
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2213 src/prefs_summaries.c:609
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:454
 msgid "Date"
 msgstr ""
 
@@ -4184,13 +4196,13 @@ msgstr ""
 msgid "Date:"
 msgstr ""
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1256
-#: src/prefs_matcher.c:2162 src/prefs_summaries.c:437
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:50 src/summaryview.c:441
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2210 src/prefs_summaries.c:611
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:452
 msgid "From"
 msgstr ""
 
-#: src/gtk/headers.h:10 src/summary_search.c:426
+#: src/gtk/headers.h:10 src/summary_search.c:414
 msgid "From:"
 msgstr ""
 
@@ -4206,25 +4218,23 @@ msgstr ""
 msgid "Reply-To"
 msgstr ""
 
-#: src/gtk/headers.h:13 src/plugins/address_keeper/address_keeper_prefs.c:140
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
-#: src/prefs_summaries.c:438 src/prefs_summary_column.c:83 src/quote_fmt.c:57
-#: src/summaryview.c:442
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2211 src/prefs_summaries.c:612
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:453
 msgid "To"
 msgstr ""
 
-#: src/gtk/headers.h:14 src/plugins/address_keeper/address_keeper_prefs.c:149
-#: src/prefs_filtering_action.c:1258 src/prefs_matcher.c:2164
-#: src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2212 src/quote_fmt.c:58
 msgid "Cc"
 msgstr ""
 
-#: src/gtk/headers.h:15 src/plugins/address_keeper/address_keeper_prefs.c:158
+#: src/gtk/headers.h:15
 msgid "Bcc"
 msgstr ""
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:2214 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr ""
 
@@ -4236,8 +4246,8 @@ msgstr ""
 msgid "In-Reply-To"
 msgstr ""
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:60
 msgid "References"
 msgstr ""
 
@@ -4245,18 +4255,18 @@ msgstr ""
 msgid "References:"
 msgstr ""
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1255
-#: src/prefs_matcher.c:2161 src/prefs_summaries.c:439
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:56 src/summaryview.c:440
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1220
+#: src/prefs_matcher.c:2209 src/prefs_summaries.c:613
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:451
 msgid "Subject"
 msgstr ""
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:703
-#: src/summary_search.c:440
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/summary_search.c:428
 msgid "Subject:"
 msgstr ""
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:433
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
 msgid "Comments"
 msgstr ""
 
@@ -4268,7 +4278,7 @@ msgstr ""
 msgid "Keywords"
 msgstr ""
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Keywords:"
 msgstr ""
 
@@ -4344,8 +4354,8 @@ msgstr ""
 msgid "Received:"
 msgstr ""
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr ""
 
@@ -4370,12 +4380,13 @@ msgid "Seen:"
 msgstr ""
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:443
-#: src/prefs_summary_column.c:79 src/summaryview.c:2786
+#: src/gtk/sslcertwindow.c:166 src/prefs_summaries.c:617
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
+#: src/summaryview.c:2865
 msgid "Status"
 msgstr ""
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:880
+#: src/gtk/headers.h:37
 msgid "Status:"
 msgstr ""
 
@@ -4415,7 +4426,7 @@ msgstr ""
 msgid "Content-Type"
 msgstr ""
 
-#: src/gtk/headers.h:42 src/image_viewer.c:327
+#: src/gtk/headers.h:42 src/image_viewer.c:328
 msgid "Content-Type:"
 msgstr ""
 
@@ -4443,7 +4454,7 @@ msgstr ""
 msgid "Precedence:"
 msgstr ""
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1066
+#: src/gtk/headers.h:46 src/prefs_account.c:1166
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4571,136 +4582,148 @@ msgstr ""
 msgid "From, To or Subject:"
 msgstr ""
 
-#: src/gtk/icon_legend.c:64
+#: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:65
+#: src/gtk/icon_legend.c:68
 msgid "Unread message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:66
+#: src/gtk/icon_legend.c:69
 msgid "Message has been replied to"
 msgstr ""
 
-#: src/gtk/icon_legend.c:67
+#: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded"
 msgstr ""
 
-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:71
 msgid "Message has been forwarded and replied to"
 msgstr ""
 
-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:72
 msgid "Message is in an ignored thread"
 msgstr ""
 
-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:73
 msgid "Message is in a watched thread"
 msgstr ""
 
-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:74
 msgid "Message is spam"
 msgstr ""
 
-#: src/gtk/icon_legend.c:73
+#: src/gtk/icon_legend.c:76
 msgid "Message has attachment(s)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:74
+#: src/gtk/icon_legend.c:77
 msgid "Digitally signed message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:75
+#: src/gtk/icon_legend.c:78
 msgid "Encrypted message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:79
 msgid "Message is signed and has attachment(s)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:80
 msgid "Message is encrypted and has attachment(s)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:79
+#: src/gtk/icon_legend.c:82
 msgid "Marked message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:80
+#: src/gtk/icon_legend.c:83
 msgid "Message is marked for deletion"
 msgstr ""
 
-#: src/gtk/icon_legend.c:81
+#: src/gtk/icon_legend.c:84
 msgid "Message is marked for moving"
 msgstr ""
 
-#: src/gtk/icon_legend.c:82
+#: src/gtk/icon_legend.c:85
 msgid "Message is marked for copying"
 msgstr ""
 
-#: src/gtk/icon_legend.c:84
+#: src/gtk/icon_legend.c:87
 msgid "Locked message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:86
+#: src/gtk/icon_legend.c:89
 msgid "Folder (normal, opened)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:90
 msgid "Folder with read messages hidden"
 msgstr ""
 
-#: src/gtk/icon_legend.c:88
+#: src/gtk/icon_legend.c:91
 msgid "Folder contains marked messages"
 msgstr ""
 
-#: src/gtk/icon_legend.c:122
+#: src/gtk/icon_legend.c:92
+msgid "IMAP folder which contains sub-folders only"
+msgstr ""
+
+#: src/gtk/icon_legend.c:93
+msgid "IMAP mailbox showing only subscribed folders"
+msgstr ""
+
+#: src/gtk/icon_legend.c:127
 msgid "Icon Legend"
 msgstr ""
 
-#: src/gtk/icon_legend.c:140
+#: src/gtk/icon_legend.c:145
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
-#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
+#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
 #, c-format
 msgid "Input password for %s:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
 msgid "Input password:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
+#: src/gtk/inputdialog.c:278
 msgid "Input password"
 msgstr ""
 
-#: src/gtk/inputdialog.c:273
+#: src/gtk/inputdialog.c:268
 msgid "Remember password for this session"
 msgstr ""
 
-#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:419
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
 msgid "Remember this"
 msgstr ""
 
-#: src/gtk/logwindow.c:447
+#: src/gtk/logwindow.c:449
+msgid "_Go to last error"
+msgstr ""
+
+#: src/gtk/logwindow.c:456
 msgid "Clear _Log"
 msgstr ""
 
-#: src/gtk/menu.c:137
+#: src/gtk/menu.c:135
 msgid "Warning:"
 msgstr ""
 
-#: src/gtk/menu.c:138
+#: src/gtk/menu.c:136
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4734,59 +4757,60 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
-#: src/plugins/address_keeper/address_keeper_prefs.c:256
-#: src/plugins/archive/archiver_prefs.c:90
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
+#: src/plugins/address_keeper/address_keeper_prefs.c:273
+#: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:498
+#: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:552
-#: src/plugins/fancy/fancy_prefs.c:114
+#: src/plugins/clamd/clamav_plugin_gtk.c:537
+#: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:424
-#: src/plugins/notification/notification_prefs.c:399
-#: src/plugins/notification/notification_prefs.c:414
-#: src/plugins/notification/notification_prefs.c:433
-#: src/plugins/notification/notification_prefs.c:451
-#: src/plugins/notification/notification_prefs.c:469
-#: src/plugins/notification/notification_prefs.c:487
-#: src/plugins/notification/notification_prefs.c:505
-#: src/plugins/notification/notification_prefs.c:523
-#: src/plugins/pgpcore/prefs_gpg.c:617 src/plugins/rssyl/rssyl_prefs.c:70
+#: src/plugins/managesieve/sieve_prefs.c:423
+#: src/plugins/notification/notification_prefs.c:398
+#: src/plugins/notification/notification_prefs.c:413
+#: src/plugins/notification/notification_prefs.c:432
+#: src/plugins/notification/notification_prefs.c:450
+#: src/plugins/notification/notification_prefs.c:468
+#: src/plugins/notification/notification_prefs.c:486
+#: src/plugins/notification/notification_prefs.c:504
+#: src/plugins/notification/notification_prefs.c:522
+#: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
+#: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:647
-#: src/plugins/vcalendar/vcal_prefs.c:728 src/prefs_toolbar.c:944
+#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr ""
 
 #: src/gtk/pluginwindow.c:336
-msgid "Load..."
+msgid "_Load..."
 msgstr ""
 
 #: src/gtk/pluginwindow.c:337
-msgid "Unload"
+msgid "_Unload"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:350 src/prefs_summaries.c:222
+#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:234
 msgid "Description"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:374
+#: src/gtk/pluginwindow.c:375
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 
-#: src/gtk/pluginwindow.c:415
+#: src/gtk/pluginwindow.c:416
 msgid "Click here to load one or more plugins"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:418
+#: src/gtk/pluginwindow.c:419
 msgid "Unload the selected plugin"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:483
+#: src/gtk/pluginwindow.c:484
 msgid "Loaded plugins"
 msgstr ""
 
@@ -4794,316 +4818,334 @@ msgstr ""
 msgid "Page Index"
 msgstr ""
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:842
 msgid "_Hide"
 msgstr ""
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:685
-#: src/prefs_account.c:3286 src/prefs_account.c:3304 src/prefs_account.c:3322
-#: src/prefs_account.c:3340 src/prefs_account.c:3358 src/prefs_account.c:3376
-#: src/prefs_account.c:3395 src/prefs_account.c:3488
-#: src/prefs_filtering_action.c:1421 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1875
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:692
+#: src/prefs_account.c:3741 src/prefs_account.c:3759 src/prefs_account.c:3777
+#: src/prefs_account.c:3795 src/prefs_account.c:3813 src/prefs_account.c:3831
+#: src/prefs_account.c:3850 src/prefs_account.c:3943 src/prefs_account.c:3961
+#: src/prefs_filtering_action.c:1379 src/prefs_filtering.c:397
+#: src/prefs_filtering.c:1883
 msgid "Account"
 msgstr ""
 
-#: src/gtk/quicksearch.c:451
+#: src/gtk/quicksearch.c:472
 msgid "all messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:452
+#: src/gtk/quicksearch.c:473
 msgid "messages whose age is greater than # days"
 msgstr ""
 
-#: src/gtk/quicksearch.c:453
+#: src/gtk/quicksearch.c:474
 msgid "messages whose age is less than # days"
 msgstr ""
 
-#: src/gtk/quicksearch.c:454
+#: src/gtk/quicksearch.c:475
 msgid "messages whose age is greater than # hours"
 msgstr ""
 
-#: src/gtk/quicksearch.c:455
+#: src/gtk/quicksearch.c:476
 msgid "messages whose age is less than # hours"
 msgstr ""
 
-#: src/gtk/quicksearch.c:456
+#: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
 msgstr ""
 
-#: src/gtk/quicksearch.c:457
+#: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
 msgstr ""
 
-#: src/gtk/quicksearch.c:458
+#: src/gtk/quicksearch.c:479
 msgid "messages carbon-copied to S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:459
-msgid "message is either to: or cc: to S"
+#: src/gtk/quicksearch.c:480
+msgid "message is either To: or Cc: to S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:460
+#: src/gtk/quicksearch.c:481
 msgid "deleted messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:461
+#: src/gtk/quicksearch.c:482
+msgid "messages whose date is after requested date (time is optional)"
+msgstr ""
+
+#: src/gtk/quicksearch.c:484
+msgid "messages whose date is before requested date (time is optional)"
+msgstr ""
+
+#: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
 msgstr ""
 
-#: src/gtk/quicksearch.c:462
+#: src/gtk/quicksearch.c:487
 msgid "true if execute \"S\" succeeds"
 msgstr ""
 
-#: src/gtk/quicksearch.c:463
+#: src/gtk/quicksearch.c:488
 msgid "messages originating from user S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:464
+#: src/gtk/quicksearch.c:489
 msgid "forwarded messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:465
+#: src/gtk/quicksearch.c:490
 msgid "messages which have attachments"
 msgstr ""
 
-#: src/gtk/quicksearch.c:466
+#: src/gtk/quicksearch.c:491
 msgid "messages which contain S in any header name or value"
 msgstr ""
 
-#: src/gtk/quicksearch.c:467
+#: src/gtk/quicksearch.c:492
 msgid "messages which contain S in the value of any header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:468
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in Message-ID header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:469
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in In-Reply-To header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:470
+#: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
 msgstr "messages which are marked with colour #"
 
-#: src/gtk/quicksearch.c:471
+#: src/gtk/quicksearch.c:496
 msgid "locked messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:497
 msgid "messages which are in newsgroup S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:498
 msgid "new messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:499
 msgid "old messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:500
 msgid "incomplete messages (not entirely downloaded)"
 msgstr ""
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:501
 msgid "messages which you have replied to"
 msgstr ""
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:502
 msgid "read messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:503
 msgid "messages which contain S in subject"
 msgstr ""
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
 msgstr ""
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
 msgstr ""
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
 msgstr ""
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
 msgstr ""
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:508
 msgid "messages whose size is greater than # bytes"
 msgstr ""
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is smaller than # bytes"
 msgstr ""
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:510
 msgid "messages which have been sent to S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:511
 msgid "messages which tags contain S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:512
 msgid "messages which have tag(s)"
 msgstr ""
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:513
 msgid "marked messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:514
 msgid "unread messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:516
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
 msgstr ""
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
 msgstr ""
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
 msgstr ""
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:523
 msgid "match using regular expressions instead of substring search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:500
-msgid "all filtering expressions are allowed"
+#: src/gtk/quicksearch.c:525
+msgid ""
+"all filtering expressions are allowed, but cannot be mixed through logical "
+"operators with the expressions above"
 msgstr ""
 
-#: src/gtk/quicksearch.c:509 src/summary_search.c:471
+#: src/gtk/quicksearch.c:535 src/summary_search.c:461
 msgid "Extended Search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:536
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
 
-#: src/gtk/quicksearch.c:610
+#: src/gtk/quicksearch.c:640
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 
-#: src/gtk/quicksearch.c:676
+#: src/gtk/quicksearch.c:702
 msgid "From/To/Cc/Subject/Tag"
 msgstr ""
 
-#: src/gtk/quicksearch.c:687 src/plugins/archive/archiver_prefs.c:314
+#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr ""
 
-#: src/gtk/quicksearch.c:696
+#: src/gtk/quicksearch.c:722
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/quicksearch.c:706
+#: src/gtk/quicksearch.c:732
 msgid "Type-ahead"
 msgstr ""
 
-#: src/gtk/quicksearch.c:718
+#: src/gtk/quicksearch.c:744
 msgid "Run on select"
 msgstr ""
 
-#: src/gtk/quicksearch.c:760
+#: src/gtk/quicksearch.c:780
 msgid "Clear the current search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:770 src/summary_search.c:424
+#: src/gtk/quicksearch.c:790 src/summary_search.c:412
 msgid "Edit search criteria"
 msgstr ""
 
-#: src/gtk/quicksearch.c:779
+#: src/gtk/quicksearch.c:799
 msgid "Information about extended symbols"
 msgstr ""
 
-#: src/gtk/quicksearch.c:817 src/gtk/quicksearch.c:832
+#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
 msgid "_Information"
 msgstr ""
 
-#: src/gtk/quicksearch.c:818 src/gtk/quicksearch.c:833
+#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/quicksearch.c:819 src/gtk/quicksearch.c:834 src/prefs_actions.c:347
-#: src/prefs_filtering.c:495 src/prefs_template.c:330
+#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:348
+#: src/prefs_filtering.c:495 src/prefs_template.c:329
 msgid "C_lear"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
-msgid "Correct"
+#: src/gtk/sslcertwindow.c:157 src/ssl_manager.c:325
+#, c-format
+msgid "Correct%s"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:162
+#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:159
+#: src/ssl_manager.c:325 src/ssl_manager.c:329
+msgid " (expired)"
+msgstr ""
+
+#: src/gtk/sslcertwindow.c:164
 msgid "Owner"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:165
 msgid "Signer"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:836
+#: src/gtk/sslcertwindow.c:172 src/gtk/sslcertwindow.c:196
 msgid "Name: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:180 src/gtk/sslcertwindow.c:204
 msgid "Organization: "
 msgstr "Organisation: "
 
-#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:188 src/gtk/sslcertwindow.c:212
 msgid "Location: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:218
+#: src/gtk/sslcertwindow.c:220
 msgid "Fingerprint: \n"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:230
 msgid "Signature status: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:235
+#: src/gtk/sslcertwindow.c:237
+msgid "Expired on: "
+msgstr ""
+
+#: src/gtk/sslcertwindow.c:237
 msgid "Expires on: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:302
+#: src/gtk/sslcertwindow.c:304
 #, c-format
-msgid "SSL certificate for %s"
+msgid "SSL/TLS certificate for %s"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:318
+#: src/gtk/sslcertwindow.c:320
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5111,7 +5153,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:340
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5120,300 +5162,305 @@ msgstr ""
 
 #: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
 #: src/gtk/sslcertwindow.c:464
+msgid "Correct"
+msgstr ""
+
+#: src/gtk/sslcertwindow.c:352 src/gtk/sslcertwindow.c:402
+#: src/gtk/sslcertwindow.c:466
 #, c-format
 msgid "Signature status: %s"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:360 src/gtk/sslcertwindow.c:410
 msgid "_View certificate"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:364
-msgid "SSL certificate is invalid"
+#: src/gtk/sslcertwindow.c:366
+msgid "SSL/TLS certificate is invalid"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:366
-msgid "SSL certificate is unknown"
+#: src/gtk/sslcertwindow.c:368
+msgid "SSL/TLS certificate is unknown"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:421
+#: src/gtk/sslcertwindow.c:483
 msgid "_Cancel connection"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:371 src/gtk/sslcertwindow.c:483
 msgid "_Accept and save"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:387
+#: src/gtk/sslcertwindow.c:389
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:414
-msgid "SSL certificate is invalid and expired"
+#: src/gtk/sslcertwindow.c:416
+msgid "SSL/TLS certificate is invalid and expired"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:416
-msgid "SSL certificate is expired"
+#: src/gtk/sslcertwindow.c:418
+msgid "SSL/TLS certificate is expired"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:421
 msgid "_Accept"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:439
+#: src/gtk/sslcertwindow.c:441
 msgid "New certificate:"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:446
 msgid "Known certificate:"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:451
+#: src/gtk/sslcertwindow.c:453
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:472
+#: src/gtk/sslcertwindow.c:474
 msgid "_View certificates"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:477
-msgid "SSL certificate changed and is invalid"
+#: src/gtk/sslcertwindow.c:479
+msgid "SSL/TLS certificate changed and is invalid"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:479
-msgid "SSL certificate changed"
+#: src/gtk/sslcertwindow.c:481
+msgid "SSL/TLS certificate changed"
 msgstr ""
 
 #: src/headerview.c:94
 msgid "Tags:"
 msgstr ""
 
-#: src/headerview.c:192 src/plugins/notification/notification_popup.c:316
-#: src/plugins/notification/notification_popup.c:623
-#: src/plugins/notification/notification_trayicon.c:884 src/summaryview.c:3344
-#: src/summaryview.c:3362 src/summaryview.c:3383
+#: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
+#: src/plugins/notification/notification_popup.c:620
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3466
+#: src/summaryview.c:3484 src/summaryview.c:3523
 msgid "(No From)"
 msgstr ""
 
-#: src/headerview.c:207 src/plugins/notification/notification_popup.c:318
-#: src/plugins/notification/notification_popup.c:627
-#: src/plugins/notification/notification_trayicon.c:887 src/summaryview.c:3395
-#: src/summaryview.c:3398
+#: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
+#: src/plugins/notification/notification_popup.c:624
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3535
+#: src/summaryview.c:3538
 msgid "(No Subject)"
 msgstr ""
 
-#: src/image_viewer.c:100
+#: src/image_viewer.c:101
 msgid "Error:"
 msgstr ""
 
-#: src/image_viewer.c:299 src/mimeview.c:2558
-#: src/plugins/att_remover/att_remover.c:301
-#: src/plugins/pdf_viewer/poppler_viewer.c:699
+#: src/image_viewer.c:300 src/mimeview.c:2614
+#: src/plugins/att_remover/att_remover.c:306
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr ""
 
-#: src/image_viewer.c:306
+#: src/image_viewer.c:307
 msgid "Filesize:"
 msgstr ""
 
-#: src/image_viewer.c:355
+#: src/image_viewer.c:356
 msgid "Load Image"
 msgstr ""
 
-#: src/imap.c:582
-msgid "IMAP4 connection broken\n"
+#: src/imap.c:577
+msgid "IMAP connection broken\n"
 msgstr ""
 
-#: src/imap.c:621 src/imap.c:624 src/imap.c:627 src/imap.c:630 src/imap.c:633
-#: src/imap.c:637 src/imap.c:640 src/imap.c:643 src/imap.c:646 src/imap.c:650
-#: src/imap.c:653 src/imap.c:656 src/imap.c:659 src/imap.c:662 src/imap.c:665
-#: src/imap.c:668 src/imap.c:671 src/imap.c:674 src/imap.c:677 src/imap.c:680
-#: src/imap.c:683 src/imap.c:686 src/imap.c:689 src/imap.c:692 src/imap.c:695
-#: src/imap.c:698 src/imap.c:701 src/imap.c:704 src/imap.c:707 src/imap.c:710
-#: src/imap.c:713 src/imap.c:716 src/imap.c:719 src/imap.c:722 src/imap.c:725
-#: src/imap.c:728 src/imap.c:731 src/imap.c:734 src/imap.c:737 src/imap.c:740
-#: src/imap.c:744 src/imap.c:748
+#: src/imap.c:616 src/imap.c:619 src/imap.c:622 src/imap.c:625 src/imap.c:628
+#: 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: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:739 src/imap.c:743
 #, c-format
 msgid "IMAP error on %s:"
 msgstr ""
 
-#: src/imap.c:621
+#: src/imap.c:616
 msgid "authenticated"
 msgstr ""
 
-#: src/imap.c:624
+#: src/imap.c:619
 msgid "not authenticated"
 msgstr ""
 
-#: src/imap.c:627
+#: src/imap.c:622
 msgid "bad state"
 msgstr ""
 
-#: src/imap.c:630
+#: src/imap.c:625
 msgid "stream error"
 msgstr ""
 
-#: src/imap.c:633
+#: src/imap.c:628
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:637
+#: src/imap.c:632
 msgid "connection refused"
 msgstr ""
 
-#: src/imap.c:640
+#: src/imap.c:635
 msgid "memory error"
 msgstr ""
 
-#: src/imap.c:643
+#: src/imap.c:638
 msgid "fatal error"
 msgstr ""
 
-#: src/imap.c:646
+#: src/imap.c:641
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:650
+#: src/imap.c:645
 msgid "connection not accepted"
 msgstr ""
 
-#: src/imap.c:653
+#: src/imap.c:648
 msgid "APPEND error"
 msgstr ""
 
-#: src/imap.c:656
+#: src/imap.c:651
 msgid "NOOP error"
 msgstr ""
 
-#: src/imap.c:659
+#: src/imap.c:654
 msgid "LOGOUT error"
 msgstr ""
 
-#: src/imap.c:662
+#: src/imap.c:657
 msgid "CAPABILITY error"
 msgstr ""
 
-#: src/imap.c:665
+#: src/imap.c:660
 msgid "CHECK error"
 msgstr ""
 
-#: src/imap.c:668
+#: src/imap.c:663
 msgid "CLOSE error"
 msgstr ""
 
-#: src/imap.c:671
+#: src/imap.c:666
 msgid "EXPUNGE error"
 msgstr ""
 
-#: src/imap.c:674
+#: src/imap.c:669
 msgid "COPY error"
 msgstr ""
 
-#: src/imap.c:677
+#: src/imap.c:672
 msgid "UID COPY error"
 msgstr ""
 
-#: src/imap.c:680
+#: src/imap.c:675
 msgid "CREATE error"
 msgstr ""
 
-#: src/imap.c:683
+#: src/imap.c:678
 msgid "DELETE error"
 msgstr ""
 
-#: src/imap.c:686
+#: src/imap.c:681
 msgid "EXAMINE error"
 msgstr ""
 
-#: src/imap.c:689
+#: src/imap.c:684
 msgid "FETCH error"
 msgstr ""
 
-#: src/imap.c:692
+#: src/imap.c:687
 msgid "UID FETCH error"
 msgstr ""
 
-#: src/imap.c:695
+#: src/imap.c:690
 msgid "LIST error"
 msgstr ""
 
-#: src/imap.c:698
+#: src/imap.c:693
 msgid "LOGIN error"
 msgstr ""
 
-#: src/imap.c:701
+#: src/imap.c:696
 msgid "LSUB error"
 msgstr ""
 
-#: src/imap.c:704
+#: src/imap.c:699
 msgid "RENAME error"
 msgstr ""
 
-#: src/imap.c:707
+#: src/imap.c:702
 msgid "SEARCH error"
 msgstr ""
 
-#: src/imap.c:710
+#: src/imap.c:705
 msgid "UID SEARCH error"
 msgstr ""
 
-#: src/imap.c:713
+#: src/imap.c:708
 msgid "SELECT error"
 msgstr ""
 
-#: src/imap.c:716
+#: src/imap.c:711
 msgid "STATUS error"
 msgstr ""
 
-#: src/imap.c:719
+#: src/imap.c:714
 msgid "STORE error"
 msgstr ""
 
-#: src/imap.c:722
+#: src/imap.c:717
 msgid "UID STORE error"
 msgstr ""
 
-#: src/imap.c:725
+#: src/imap.c:720
 msgid "SUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:728
+#: src/imap.c:723
 msgid "UNSUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:731
+#: src/imap.c:726
 msgid "STARTTLS error"
 msgstr ""
 
-#: src/imap.c:734
+#: src/imap.c:729
 msgid "INVAL error"
 msgstr ""
 
-#: src/imap.c:737
+#: src/imap.c:732
 msgid "EXTENSION error"
 msgstr ""
 
-#: src/imap.c:740
+#: src/imap.c:735
 msgid "SASL error"
 msgstr ""
 
-#: src/imap.c:744
-msgid "SSL error"
+#: src/imap.c:739
+msgid "SSL/TLS error"
 msgstr ""
 
-#: src/imap.c:748
+#: src/imap.c:743
 #, c-format
 msgid "Unknown error [%d]"
 msgstr ""
 
-#: src/imap.c:952
+#: src/imap.c:947
 msgid ""
 "\n"
 "\n"
@@ -5421,7 +5468,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:958
+#: src/imap.c:953
 msgid ""
 "\n"
 "\n"
@@ -5429,7 +5476,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:964
+#: src/imap.c:959
 msgid ""
 "\n"
 "\n"
@@ -5437,7 +5484,7 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:970
+#: src/imap.c:965
 msgid ""
 "\n"
 "\n"
@@ -5445,7 +5492,7 @@ msgid ""
 "the PLAIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:976
+#: src/imap.c:971
 msgid ""
 "\n"
 "\n"
@@ -5453,162 +5500,166 @@ msgid ""
 "the LOGIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:983
+#: src/imap.c:978
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
-#: src/imap.c:987
+#: src/imap.c:982
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
-#: src/imap.c:1005
+#: src/imap.c:1000
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
-#: src/imap.c:1012 src/imap.c:1015
+#: src/imap.c:1007 src/imap.c:1010
 #, c-format
-msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
+msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1045 src/imap.c:3689 src/imap.c:4348 src/imap.c:4442
-#: src/imap.c:4620 src/imap.c:5431
+#: src/imap.c:1040 src/imap.c:3678 src/imap.c:4337 src/imap.c:4431
+#: src/imap.c:4609 src/imap.c:5420
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
-#: src/imap.c:1154 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1150 src/inc.c:870 src/news.c:401 src/send_message.c:285
 msgid "Insecure connection"
 msgstr ""
 
-#: src/imap.c:1155 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1151 src/inc.c:871 src/news.c:402 src/send_message.c:286
 msgid ""
-"This connection is configured to be secured using SSL, but SSL is not "
-"available in this build of Claws Mail. \n"
+"This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
+"not available in this build of Claws Mail. \n"
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1161 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1157 src/inc.c:877 src/news.c:408 src/send_message.c:292
 msgid "Con_tinue connecting"
 msgstr ""
 
-#: src/imap.c:1171
+#: src/imap.c:1167
 #, c-format
-msgid "Account '%s': Connecting to IMAP4 server: %s:%d..."
+msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr ""
 
-#: src/imap.c:1219
+#: src/imap.c:1232
 #, c-format
-msgid "Can't connect to IMAP4 server: %s:%d"
+msgid "Can't connect to IMAP server: %s:%d"
 msgstr ""
 
-#: src/imap.c:1222
+#: src/imap.c:1235
 #, c-format
-msgid "Can't connect to IMAP4 server: %s:%d\n"
+msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1255 src/imap.c:4110
-msgid "Can't start TLS session.\n"
+#: src/imap.c:1267 src/imap.c:4099
+msgid "Can't start STARTTLS session.\n"
 msgstr ""
 
-#: src/imap.c:1322
+#: src/imap.c:1334
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr ""
 
-#: src/imap.c:1325
+#: src/imap.c:1337
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
-#: src/imap.c:1752
+#: src/imap.c:1765
 msgid "Adding messages..."
 msgstr ""
 
-#: src/imap.c:1957 src/mh.c:529
+#: src/imap.c:1970 src/mh.c:530
 msgid "Copying messages..."
 msgstr ""
 
-#: src/imap.c:2550
+#: src/imap.c:2492
+msgid "Search failed due to server error."
+msgstr ""
+
+#: src/imap.c:2571
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2557 src/imap.c:5061
+#: src/imap.c:2578 src/imap.c:5050
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:2908
+#: src/imap.c:2929
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2911
+#: src/imap.c:2932
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3229
+#: src/imap.c:3220
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3244
+#: src/imap.c:3233
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3375
+#: src/imap.c:3364
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3488
+#: src/imap.c:3477
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3767
+#: src/imap.c:3756
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3852
+#: src/imap.c:3841
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:3955
+#: src/imap.c:3944
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4107
-msgid "Server requires TLS to log in.\n"
+#: src/imap.c:4096
+msgid "Server requires STARTTLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4117
+#: src/imap.c:4106
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4122
+#: src/imap.c:4111
 #, c-format
 msgid ""
-"Connection to %s failed: server requires TLS, but Claws Mail has been "
-"compiled without TLS support.\n"
+"Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
+"compiled without STARTTLS support.\n"
 msgstr ""
 
-#: src/imap.c:4130
+#: src/imap.c:4119
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4353
+#: src/imap.c:4342
 msgid "Fetching message..."
 msgstr ""
 
-#: src/imap.c:5054
+#: src/imap.c:5043
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:6089
+#: src/imap.c:6078
 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"
@@ -5654,7 +5705,7 @@ msgstr ""
 msgid "_Subscribe..."
 msgstr ""
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:168
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
 msgstr ""
 
@@ -5687,27 +5738,37 @@ msgid "Inherit properties from parent folder"
 msgstr ""
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:411 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2048
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:195
+#: src/plugins/vcalendar/vcal_folder.c:2057
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:412
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2049
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/vcalendar/vcal_folder.c:2058
 msgid "Rename folder"
 msgstr ""
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2069
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:219
+#: src/plugins/vcalendar/vcal_folder.c:2078
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 
-#: src/imap_gtk.c:357 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
+#, c-format
+msgid "Select folder to move folder '%s' to"
+msgstr ""
+
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
+#, c-format
+msgid "Select folder to copy folder '%s' to"
+msgstr ""
+
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -5716,44 +5777,44 @@ msgid ""
 "Do you really want to delete?"
 msgstr ""
 
-#: src/imap_gtk.c:376 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
 #: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2002
+#: src/plugins/vcalendar/vcal_folder.c:2011
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 
-#: src/imap_gtk.c:498
+#: src/imap_gtk.c:506
 #, c-format
 msgid "Do you want to search for unsubscribed subfolders of '%s'?"
 msgstr ""
 
-#: src/imap_gtk.c:501
+#: src/imap_gtk.c:509
 msgid "Search recursively"
 msgstr ""
 
-#: src/imap_gtk.c:506 src/imap_gtk.c:565
+#: src/imap_gtk.c:514 src/imap_gtk.c:573
 msgid "Subscriptions"
 msgstr ""
 
-#: src/imap_gtk.c:507
+#: src/imap_gtk.c:515
 msgid "_Search"
 msgstr ""
 
-#: src/imap_gtk.c:517
+#: src/imap_gtk.c:525
 #, c-format
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: src/imap_gtk.c:528 src/mainwindow.c:679
+#: src/imap_gtk.c:536 src/mainwindow.c:681
 msgid "Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:530 src/imap_gtk.c:532
+#: src/imap_gtk.c:538 src/imap_gtk.c:540
 msgid "All of them"
 msgstr ""
 
-#: src/imap_gtk.c:548
+#: src/imap_gtk.c:556
 msgid ""
 "This folder is already subscribed and has no unsubscribed subfolders.\n"
 "\n"
@@ -5761,29 +5822,29 @@ msgid ""
 "\"Check for new folders\" at the mailbox's root folder."
 msgstr ""
 
-#: src/imap_gtk.c:557
+#: src/imap_gtk.c:565
 #, c-format
 msgid "Do you want to %s the '%s' folder?"
 msgstr ""
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:566
 msgid "subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:558
+#: src/imap_gtk.c:566
 msgid "unsubscribe"
 msgstr ""
 
-#: src/imap_gtk.c:560 src/prefs_folder_item.c:1428 src/prefs_folder_item.c:1456
-#: src/prefs_folder_item.c:1484
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
+#: src/prefs_folder_item.c:1593
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/imap_gtk.c:566
+#: src/imap_gtk.c:574
 msgid "_Subscribe"
 msgstr ""
 
-#: src/imap_gtk.c:567 src/news_gtk.c:252
+#: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -5817,6 +5878,10 @@ msgstr ""
 msgid "Select importing file"
 msgstr ""
 
+#: src/import.c:272
+msgid "Select folder to import to"
+msgstr ""
+
 #: src/importldif.c:185
 msgid "Please specify address book name and file to import."
 msgstr ""
@@ -5829,65 +5894,65 @@ msgstr ""
 msgid "File imported."
 msgstr ""
 
-#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:334 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr ""
 
-#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:340 src/importmutt.c:127 src/importpine.c:126
 msgid "Address book name must be supplied."
 msgstr ""
 
-#: src/importldif.c:496
+#: src/importldif.c:380
 msgid "LDIF file imported successfully."
 msgstr ""
 
-#: src/importldif.c:581
+#: src/importldif.c:465
 msgid "Select LDIF File"
 msgstr ""
 
-#: src/importldif.c:667
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr ""
 
-#: src/importldif.c:672
+#: src/importldif.c:556
 msgid "File Name"
 msgstr ""
 
-#: src/importldif.c:682
+#: src/importldif.c:566
 msgid "The full file specification of the LDIF file to import."
 msgstr ""
 
-#: src/importldif.c:689
+#: src/importldif.c:573
 msgid "Select the LDIF file to import."
 msgstr ""
 
-#: src/importldif.c:725
+#: src/importldif.c:705
 msgid "R"
 msgstr ""
 
-#: src/importldif.c:726 src/summaryview.c:438
+#: src/importldif.c:710 src/summaryview.c:449
 msgid "S"
 msgstr ""
 
-#: src/importldif.c:727
+#: src/importldif.c:716
 msgid "LDIF Field Name"
 msgstr ""
 
-#: src/importldif.c:728
+#: src/importldif.c:721
 msgid "Attribute Name"
 msgstr ""
 
-#: src/importldif.c:783
+#: src/importldif.c:740
 msgid "LDIF Field"
 msgstr ""
 
-#: src/importldif.c:795
+#: src/importldif.c:752
 msgid "Attribute"
 msgstr ""
 
-#: src/importldif.c:807
+#: src/importldif.c:764
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -5898,35 +5963,35 @@ msgid ""
 "field for import."
 msgstr ""
 
-#: src/importldif.c:822
+#: src/importldif.c:779
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
 
-#: src/importldif.c:827
+#: src/importldif.c:784
 msgid "Select for Import"
 msgstr ""
 
-#: src/importldif.c:832
+#: src/importldif.c:789
 msgid "Select the LDIF field for import into the address book."
 msgstr ""
 
-#: src/importldif.c:834
+#: src/importldif.c:791
 msgid " Modify "
 msgstr ""
 
-#: src/importldif.c:839
+#: src/importldif.c:796
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 
-#: src/importldif.c:911
+#: src/importldif.c:870
 msgid "Records Imported:"
 msgstr ""
 
-#: src/importldif.c:943
+#: src/importldif.c:902
 msgid "Import LDIF file into Address Book"
 msgstr ""
 
-#: src/importldif.c:980
+#: src/importldif.c:939
 msgid "Proceed"
 msgstr ""
 
@@ -5958,248 +6023,293 @@ msgstr ""
 msgid "Import Pine file into Address Book"
 msgstr ""
 
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: src/inc.c:191 src/inc.c:299 src/inc.c:325
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 
-#: src/inc.c:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: src/inc.c:416
+#: src/inc.c:473
 msgid "Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:474
+#: src/inc.c:531
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:672 src/inc.c:726
 msgid "Cancelled"
 msgstr ""
 
-#: src/inc.c:626
+#: src/inc.c:683
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:635
+#: src/inc.c:692
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:641
+#: src/inc.c:698
 msgid "Done (no new messages)"
 msgstr ""
 
-#: src/inc.c:646
+#: src/inc.c:703
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:886
+#: src/inc.c:706 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr ""
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:88 src/summaryview.c:2782 src/summaryview.c:6292
+#: src/inc.c:713 src/prefs_matcher.c:407 src/prefs_summaries.c:620
+#: src/prefs_summary_column.c:87 src/summaryview.c:2861 src/summaryview.c:6510
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:377
+#: src/inc.c:723 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:752
+#: src/inc.c:809
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:756
+#: src/inc.c:813
 msgid "Finished (no new messages)"
 msgstr ""
 
-#: src/inc.c:795
+#: src/inc.c:854
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:825
+#: src/inc.c:884
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr ""
 
-#: src/inc.c:843
+#: src/inc.c:918
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
-#: src/inc.c:847
+#: src/inc.c:922
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:1002 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:515
 msgid "Authenticating..."
 msgstr ""
 
-#: src/inc.c:929
+#: src/inc.c:1004
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr ""
 
-#: src/inc.c:935
+#: src/inc.c:1010
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
-#: src/inc.c:939
+#: src/inc.c:1014
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
-#: src/inc.c:943
+#: src/inc.c:1018
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
-#: src/inc.c:947
+#: src/inc.c:1022
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:1029 src/send_message.c:533
 msgid "Quitting"
 msgstr ""
 
-#: src/inc.c:979
+#: src/inc.c:1054
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
-#: src/inc.c:992
+#: src/inc.c:1067
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1151
+#: src/inc.c:1226
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
-#: src/inc.c:1156
+#: src/inc.c:1231
 msgid "Error occurred while processing mail."
 msgstr ""
 
-#: src/inc.c:1162
+#: src/inc.c:1237
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1168
+#: src/inc.c:1243
 msgid "No disk space left."
 msgstr ""
 
-#: src/inc.c:1173
+#: src/inc.c:1248
 msgid "Can't write file."
 msgstr ""
 
-#: src/inc.c:1178
+#: src/inc.c:1253
 msgid "Socket error."
 msgstr ""
 
-#: src/inc.c:1181
+#: src/inc.c:1256
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1261 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1189
+#: src/inc.c:1264
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1194
+#: src/inc.c:1269
 msgid "Mailbox is locked."
 msgstr ""
 
-#: src/inc.c:1198
+#: src/inc.c:1273
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1279 src/send_message.c:692
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1285 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1215 src/send_message.c:692
+#: src/inc.c:1290 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
 
-#: src/inc.c:1220
+#: src/inc.c:1295
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1258
+#: src/inc.c:1333
 msgid "Incorporation cancelled\n"
 msgstr ""
 
-#: src/inc.c:1523
+#: src/inc.c:1625 src/plugins/notification/notification_prefs.c:1072
+#: src/plugins/notification/notification_prefs.c:1367
+#: src/plugins/notification/notification_prefs.c:1673
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1786
+#: src/prefs_other.c:572 src/prefs_receive.c:203 src/prefs_summaries.c:500
+msgid "seconds"
+msgstr ""
+
+#: src/inc.c:1635 src/inc.c:1645
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/inc.c:1638
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/inc.c:1650
 #, c-format
-msgid "%s%sYou're working offline. Override for %d minutes?"
+msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr ""
 
-#: src/inc.c:1529
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 
-#: src/inc.c:1536
+#: src/inc.c:1663
 msgid "On_ly once"
 msgstr ""
 
-#: src/ldapupdate.c:1056
+#: src/ldapupdate.c:680
+#, c-format
+msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
+msgstr ""
+
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
+#: src/ldapupdate.c:1330
+#, c-format
+msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
+msgstr ""
+
+#: src/ldapupdate.c:1046
 msgid "Some SN"
 msgstr ""
 
-#: src/ldif.c:758
+#: src/ldapupdate.c:1133
+#, c-format
+msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
+msgstr ""
+
+#: src/ldaputil.c:81 src/ldaputil.c:156
+msgid "LDAP (search): successful\n"
+msgstr ""
+
+#: src/ldaputil.c:112 src/ldaputil.c:200
+#, c-format
+msgid "LDAP error (search): %d (%s)\n"
+msgstr ""
+
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr ""
 
-#: src/main.c:244
+#: src/main.c:248
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 
-#: src/main.c:365
+#: src/main.c:372
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 
-#: src/main.c:367
+#: src/main.c:374
 #, c-format
 msgid ""
 "\n"
@@ -6208,42 +6318,42 @@ msgid ""
 "script available at %s."
 msgstr ""
 
-#: src/main.c:379
+#: src/main.c:386
 msgid "Keep old configuration"
 msgstr ""
 
-#: src/main.c:382
+#: src/main.c:389
 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:390
+#: src/main.c:397
 msgid "Migration of configuration"
 msgstr ""
 
-#: src/main.c:401
+#: src/main.c:408
 msgid "Copying configuration... This may take a while..."
 msgstr ""
 
-#: src/main.c:410
+#: src/main.c:417
 msgid "Migration failed!"
 msgstr ""
 
-#: src/main.c:419
+#: src/main.c:426
 msgid "Migrating configuration..."
 msgstr ""
 
-#: src/main.c:1119
+#: src/main.c:1128
 msgid "g_thread is not supported by glib.\n"
 msgstr ""
 
-#: src/main.c:1139 src/main.c:1143 src/main.c:1147
+#: src/main.c:1148 src/main.c:1152 src/main.c:1156
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1448
+#: src/main.c:1495
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6256,50 +6366,50 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.c:1499
+#: src/main.c:1537
 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:1505
+#: src/main.c:1543
 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:1750
+#: src/main.c:1783
 msgid "Missing filename\n"
 msgstr ""
 
-#: src/main.c:1757
+#: src/main.c:1790
 msgid "Cannot open filename for reading\n"
 msgstr ""
 
-#: src/main.c:1768
+#: src/main.c:1801
 msgid "Malformed header\n"
 msgstr ""
 
-#: src/main.c:1775
+#: src/main.c:1808
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1786
+#: src/main.c:1819
 msgid "Missing required 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1929
+#: src/main.c:1964
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:1931
+#: src/main.c:1966
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:1932
+#: src/main.c:1967
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6310,34 +6420,41 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:1972
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 
-#: src/main.c:1938
+#: src/main.c:1973
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:1976
+msgid ""
+"  --insert file1 [file2]...\n"
+"                         open composition window with specified files\n"
+"                         inserted"
+msgstr ""
+
+#: src/main.c:1979
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:1980
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:1981
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:1982
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:1983
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6348,1322 +6465,1363 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:1990
 msgid "  --send                 send all queued messages"
 msgstr ""
 
-#: src/main.c:1953
+#: src/main.c:1991
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:1992
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
-#: src/main.c:1956
+#: src/main.c:1994
 msgid "  --statistics           show session statistics"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:1995
 msgid "  --reset-statistics     reset session statistics"
 msgstr ""
 
-#: src/main.c:1958
+#: src/main.c:1996
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
 msgstr ""
 
-#: src/main.c:1960
+#: src/main.c:1998
 msgid "  --online               switch to online mode"
 msgstr ""
 
-#: src/main.c:1961
+#: src/main.c:1999
 msgid "  --offline              switch to offline mode"
 msgstr ""
 
-#: src/main.c:1962
+#: src/main.c:2000
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2001
 msgid "  --debug                debug mode"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2002
 msgid "  --toggle-debug         toggle debug mode"
 msgstr ""
 
-#: src/main.c:1965
+#: src/main.c:2003
 msgid "  --help -h              display this help and exit"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2004
 msgid "  --version -v           output version information and exit"
 msgstr ""
 
-#: src/main.c:1967
+#: src/main.c:2005
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2006
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2007
 msgid ""
 "  --alternate-config-dir [dir]\n"
 "                         use specified configuration directory"
 msgstr ""
 
-#: src/main.c:1971
+#: src/main.c:2009
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
 msgstr ""
 
-#: src/main.c:2024
+#: src/main.c:2062
 msgid "Unknown option\n"
 msgstr ""
 
-#: src/main.c:2042
+#: src/main.c:2080
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
-#: src/main.c:2045
+#: src/main.c:2083
 msgid "top level folder"
 msgstr ""
 
-#: src/main.c:2128
+#: src/main.c:2165
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:2129
+#: src/main.c:2166
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
-#: src/main.c:2871
+#: src/main.c:2913
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:2877
+#: src/main.c:2919
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
-#: src/mainwindow.c:511 src/messageview.c:208
+#: src/mainwindow.c:514 src/messageview.c:211
 msgid "_File"
 msgstr ""
 
-#: src/mainwindow.c:513 src/messageview.c:210 src/summaryview.c:433
+#: src/mainwindow.c:516 src/messageview.c:213 src/summaryview.c:444
 msgid "_View"
 msgstr ""
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:519
 msgid "_Configuration"
 msgstr ""
 
-#: src/mainwindow.c:520
+#: src/mainwindow.c:523
 msgid "_Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:524
 msgid "MH..."
 msgstr ""
 
-#: src/mainwindow.c:524
+#: src/mainwindow.c:527
 msgid "Change mailbox order..."
 msgstr ""
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:530
 msgid "_Import mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:531
 msgid "_Export to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:532
 msgid "_Export selected to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:534
 msgid "Empty all _Trash folders"
 msgstr "Empty all Was_tebin folders"
 
-#: src/mainwindow.c:534 src/messageview.c:217
+#: src/mainwindow.c:537 src/messageview.c:220
 msgid "_Save email as..."
 msgstr ""
 
-#: src/mainwindow.c:535 src/messageview.c:218
+#: src/mainwindow.c:538 src/messageview.c:221
 msgid "_Save part as..."
 msgstr ""
 
-#: src/mainwindow.c:538 src/messageview.c:219
+#: src/mainwindow.c:541 src/messageview.c:222
 msgid "Page setup..."
 msgstr ""
 
-#: src/mainwindow.c:539 src/messageview.c:220
+#: src/mainwindow.c:542 src/messageview.c:223
 msgid "_Print..."
 msgstr ""
 
-#: src/mainwindow.c:541
+#: src/mainwindow.c:544
 msgid "Synchronise folders"
 msgstr ""
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:546
 msgid "E_xit"
 msgstr ""
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:551
 msgid "Select _thread"
 msgstr ""
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:553
 msgid "_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:555
 msgid "_Quick search"
 msgstr ""
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:558
 msgid "Show or hi_de"
 msgstr ""
 
-#: src/mainwindow.c:556
+#: src/mainwindow.c:559
 msgid "_Toolbar"
 msgstr ""
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:561
 msgid "Set displayed _columns"
 msgstr ""
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:562
 msgid "In _folder list..."
 msgstr ""
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:563
 msgid "In _message list..."
 msgstr ""
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:568
 msgid "La_yout"
 msgstr ""
 
-#: src/mainwindow.c:568
+#: src/mainwindow.c:570
 msgid "_Sort"
 msgstr ""
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:572
 msgid "_Attract by subject"
 msgstr ""
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:574
 msgid "E_xpand all threads"
 msgstr ""
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:575
 msgid "Co_llapse all threads"
 msgstr ""
 
-#: src/mainwindow.c:575 src/messageview.c:231
+#: src/mainwindow.c:577 src/messageview.c:234
 msgid "_Go to"
 msgstr ""
 
-#: src/mainwindow.c:576 src/messageview.c:232
+#: src/mainwindow.c:578 src/messageview.c:235
 msgid "_Previous message"
 msgstr ""
 
-#: src/mainwindow.c:577 src/messageview.c:233
+#: src/mainwindow.c:579 src/messageview.c:236
 msgid "_Next message"
 msgstr ""
 
-#: src/mainwindow.c:579 src/messageview.c:235
+#: src/mainwindow.c:581 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr ""
 
-#: src/mainwindow.c:580 src/messageview.c:236
+#: src/mainwindow.c:582 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr ""
 
-#: src/mainwindow.c:582 src/messageview.c:238
+#: src/mainwindow.c:584 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr ""
 
-#: src/mainwindow.c:583 src/messageview.c:239
+#: src/mainwindow.c:585 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr ""
 
-#: src/mainwindow.c:585 src/messageview.c:241
+#: src/mainwindow.c:587 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr ""
 
-#: src/mainwindow.c:586 src/messageview.c:242
+#: src/mainwindow.c:588 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr ""
 
-#: src/mainwindow.c:588 src/messageview.c:244
+#: src/mainwindow.c:590 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "Previous _labelled message"
 
-#: src/mainwindow.c:589 src/messageview.c:245
+#: src/mainwindow.c:591 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "Next la_belled message"
 
-#: src/mainwindow.c:591 src/messageview.c:247
+#: src/mainwindow.c:593 src/messageview.c:250
 msgid "Previous opened message"
 msgstr ""
 
-#: src/mainwindow.c:592 src/messageview.c:248
+#: src/mainwindow.c:594 src/messageview.c:251
 msgid "Next opened message"
 msgstr ""
 
-#: src/mainwindow.c:594 src/messageview.c:250
+#: src/mainwindow.c:596 src/messageview.c:253
 msgid "Parent message"
 msgstr ""
 
-#: src/mainwindow.c:596 src/messageview.c:252
+#: src/mainwindow.c:598 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr ""
 
-#: src/mainwindow.c:597 src/messageview.c:253
+#: src/mainwindow.c:599 src/messageview.c:256
 msgid "F_older..."
 msgstr ""
 
-#: src/mainwindow.c:599 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:601 src/messageview.c:258 src/mimeview.c:201
 msgid "Next part"
 msgstr ""
 
-#: src/mainwindow.c:600 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:602 src/messageview.c:259 src/mimeview.c:202
 msgid "Previous part"
 msgstr ""
 
-#: src/mainwindow.c:603 src/messageview.c:257
+#: src/mainwindow.c:605 src/messageview.c:260
 msgid "Message scroll"
 msgstr ""
 
-#: src/mainwindow.c:604 src/messageview.c:258
+#: src/mainwindow.c:606 src/messageview.c:261
 msgid "Previous line"
 msgstr ""
 
-#: src/mainwindow.c:605 src/messageview.c:259
+#: src/mainwindow.c:607 src/messageview.c:262
 msgid "Next line"
 msgstr ""
 
-#: src/mainwindow.c:606 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:608 src/messageview.c:263 src/printing.c:475
 msgid "Previous page"
 msgstr ""
 
-#: src/mainwindow.c:607 src/messageview.c:261 src/printing.c:488
+#: src/mainwindow.c:609 src/messageview.c:264 src/printing.c:481
 msgid "Next page"
 msgstr ""
 
-#: src/mainwindow.c:625 src/messageview.c:279
+#: src/mainwindow.c:627 src/messageview.c:282
 msgid "Decode"
 msgstr ""
 
-#: src/mainwindow.c:632
+#: src/mainwindow.c:634
 msgid "Open in new _window"
 msgstr ""
 
-#: src/mainwindow.c:633 src/messageview.c:286
+#: src/mainwindow.c:635 src/messageview.c:289
 msgid "Mess_age source"
 msgstr ""
 
-#: src/mainwindow.c:635 src/messageview.c:287
+#: src/mainwindow.c:637 src/messageview.c:290
 msgid "Message part"
 msgstr ""
 
-#: src/mainwindow.c:636 src/messageview.c:288
+#: src/mainwindow.c:638 src/messageview.c:291
 msgid "View as text"
 msgstr ""
 
-#: src/mainwindow.c:637 src/messageview.c:289 src/toolbar.c:403
+#: src/mainwindow.c:639 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr ""
 
-#: src/mainwindow.c:639 src/messageview.c:291
+#: src/mainwindow.c:641 src/messageview.c:294
 msgid "Open with..."
 msgstr ""
 
-#: src/mainwindow.c:643 src/messageview.c:294
+#: src/mainwindow.c:645 src/messageview.c:297
 msgid "Quotes"
 msgstr ""
 
-#: src/mainwindow.c:645
+#: src/mainwindow.c:647
 msgid "_Update summary"
 msgstr ""
 
-#: src/mainwindow.c:648
+#: src/mainwindow.c:650
 msgid "Recei_ve"
 msgstr ""
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:651
 msgid "Get from _current account"
 msgstr ""
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:652
 msgid "Get from _all accounts"
 msgstr ""
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:653
 msgid "Cancel receivin_g"
 msgstr ""
 
-#: src/mainwindow.c:654
+#: src/mainwindow.c:656
 msgid "_Send queued messages"
 msgstr ""
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:661
 msgid "Compose a_n email message"
 msgstr ""
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:662
 msgid "Compose a news message"
 msgstr ""
 
-#: src/mainwindow.c:662 src/messageview.c:300
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:664 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:428
 msgid "_Reply"
 msgstr ""
 
-#: src/mainwindow.c:663 src/messageview.c:301 src/summaryview.c:425
+#: src/mainwindow.c:665 src/messageview.c:304 src/summaryview.c:429
 msgid "Repl_y to"
 msgstr ""
 
-#: src/mainwindow.c:666 src/messageview.c:304
+#: src/mainwindow.c:668 src/messageview.c:307 src/summaryview.c:432
 msgid "Mailing _list"
 msgstr ""
 
-#: src/mainwindow.c:667
+#: src/mainwindow.c:669
 msgid "Follow-up and reply to"
 msgstr ""
 
-#: src/mainwindow.c:670 src/messageview.c:307 src/toolbar.c:2069
+#: src/mainwindow.c:672 src/messageview.c:310 src/summaryview.c:434
+#: src/toolbar.c:2449
 msgid "_Forward"
 msgstr ""
 
-#: src/mainwindow.c:671 src/messageview.c:308 src/toolbar.c:2070
+#: src/mainwindow.c:673 src/messageview.c:311 src/summaryview.c:435
+#: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr ""
 
-#: src/mainwindow.c:672 src/messageview.c:309 src/toolbar.c:2071
+#: src/mainwindow.c:674 src/messageview.c:312 src/summaryview.c:436
+#: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr ""
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:676
 msgid "Mailing-_List"
 msgstr ""
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:677
 msgid "Post"
 msgstr ""
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:679
 msgid "Help"
 msgstr ""
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:683
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:685
 msgid "View archive"
 msgstr ""
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:687
 msgid "Contact owner"
 msgstr ""
 
-#: src/mainwindow.c:689
+#: src/mainwindow.c:691
 msgid "M_ove..."
 msgstr ""
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:692
 msgid "_Copy..."
 msgstr ""
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:693
 msgid "Move to _trash"
 msgstr "Move to was_tebin"
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:694
 msgid "_Delete..."
 msgstr ""
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:695
 msgid "Move thread to tr_ash"
 msgstr "Move thread to was_tebin"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:696
 msgid "Delete t_hread"
 msgstr ""
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:697
 msgid "Cancel a news message"
 msgstr ""
 
-#: src/mainwindow.c:698 src/mainwindow.c:699 src/summaryview.c:426
+#: src/mainwindow.c:700 src/mainwindow.c:701 src/summaryview.c:437
 msgid "_Mark"
 msgstr ""
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:702
 msgid "_Unmark"
 msgstr ""
 
-#: src/mainwindow.c:703
-msgid "Mark as unr_ead"
-msgstr ""
-
-#: src/mainwindow.c:704
+#: src/mainwindow.c:705
 msgid "Mark as rea_d"
 msgstr ""
 
 #: src/mainwindow.c:706
+msgid "Mark as unr_ead"
+msgstr ""
+
+#: src/mainwindow.c:708
 msgid "Mark all read"
 msgstr ""
 
-#: src/mainwindow.c:708 src/prefs_filtering_action.c:199 src/toolbar.c:208
-#: src/toolbar.c:419
+#: src/mainwindow.c:709
+msgid "Mark all unread"
+msgstr ""
+
+#: src/mainwindow.c:711 src/prefs_filtering_action.c:193 src/toolbar.c:242
+#: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr ""
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:712
 msgid "Unignore thread"
 msgstr ""
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:200 src/toolbar.c:209
-#: src/toolbar.c:420
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:194 src/toolbar.c:243
+#: src/toolbar.c:504
 msgid "Watch thread"
 msgstr ""
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:714
 msgid "Unwatch thread"
 msgstr ""
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:717
 msgid "Mark as _spam"
 msgstr ""
 
-#: src/mainwindow.c:715
+#: src/mainwindow.c:718
 msgid "Mark as _ham"
 msgstr ""
 
-#: src/mainwindow.c:718 src/prefs_filtering_action.c:181
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr ""
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:182
+#: src/mainwindow.c:722 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr ""
 
-#: src/mainwindow.c:721 src/summaryview.c:427
+#: src/mainwindow.c:724 src/summaryview.c:438
 msgid "Color la_bel"
 msgstr "Colour la_bel"
 
-#: src/mainwindow.c:722 src/summaryview.c:428
+#: src/mainwindow.c:725 src/summaryview.c:439
 msgid "Ta_gs"
 msgstr ""
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:728
 msgid "Re-_edit"
 msgstr ""
 
-#: src/mainwindow.c:728 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:731 src/messageview.c:313 src/mimeview.c:1016
 msgid "Check signature"
 msgstr ""
 
-#: src/mainwindow.c:733 src/messageview.c:314
+#: src/mainwindow.c:736 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr ""
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:738
 msgid "C_ollect addresses"
 msgstr ""
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:739
 msgid "From current _folder..."
 msgstr ""
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:740
 msgid "From selected _messages..."
 msgstr ""
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:743
 msgid "_Filter all messages in folder"
 msgstr ""
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:744
 msgid "Filter _selected messages"
 msgstr ""
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:745
 msgid "Run folder pr_ocessing rules"
 msgstr ""
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:747 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr ""
 
-#: src/mainwindow.c:745 src/mainwindow.c:751 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
+#: src/messageview.c:327
 msgid "_Automatically"
 msgstr ""
 
-#: src/mainwindow.c:746 src/mainwindow.c:752 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
+#: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr ""
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/mainwindow.c:860
+#: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr ""
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/messageview.c:324
+#: src/messageview.c:330
 msgid "By _Subject"
 msgstr ""
 
-#: src/mainwindow.c:750 src/messageview.c:323 src/summaryview.c:431
+#: src/mainwindow.c:753 src/messageview.c:326 src/summaryview.c:442
 msgid "Create processing rule"
 msgstr ""
 
-#: src/mainwindow.c:757 src/messageview.c:331
+#: src/mainwindow.c:760 src/messageview.c:333
 msgid "List _URLs..."
 msgstr ""
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:767
 msgid "Ch_eck for new messages in all folders"
 msgstr ""
 
-#: src/mainwindow.c:765
+#: src/mainwindow.c:768
 msgid "Delete du_plicated messages"
 msgstr ""
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:769
 msgid "In selected folder"
 msgstr ""
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:770
 msgid "In all folders"
 msgstr ""
 
-#: src/mainwindow.c:770
+#: src/mainwindow.c:773
 msgid "E_xecute"
 msgstr ""
 
-#: src/mainwindow.c:771
+#: src/mainwindow.c:774
 msgid "Exp_unge"
 msgstr ""
 
-#: src/mainwindow.c:774
-msgid "SSL cer_tificates"
+#: src/mainwindow.c:777
+msgid "SSL/TLS cer_tificates"
 msgstr ""
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:780
 msgid "Filtering Lo_g"
 msgstr ""
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:781
 msgid "Network _Log"
 msgstr ""
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:783
 msgid "_Forget all session passwords"
 msgstr ""
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:785
 msgid "Forget _master passphrase"
 msgstr ""
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:789
 msgid "C_hange current account"
 msgstr ""
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:791
 msgid "_Preferences for current account..."
 msgstr ""
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:792
 msgid "Create _new account..."
 msgstr ""
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:793
 msgid "_Edit accounts..."
 msgstr ""
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:796
 msgid "P_references..."
 msgstr ""
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:797
 msgid "Pre-pr_ocessing..."
 msgstr ""
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:798
 msgid "Post-pro_cessing..."
 msgstr ""
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:799
 msgid "_Filtering..."
 msgstr ""
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:800
 msgid "_Templates..."
 msgstr ""
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:801
 msgid "_Actions..."
 msgstr ""
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:802
 msgid "Tag_s..."
 msgstr ""
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:804
 msgid "Plu_gins..."
 msgstr ""
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:807
 msgid "_Manual"
 msgstr ""
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:808
 msgid "_Online User-contributed FAQ"
 msgstr ""
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:809
 msgid "Icon _Legend"
 msgstr ""
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:811
 msgid "Set as default client"
 msgstr ""
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:818
 msgid "Offline _mode"
 msgstr ""
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:819
 msgid "Men_ubar"
 msgstr ""
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:820
 msgid "_Message view"
 msgstr ""
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:822
 msgid "Status _bar"
 msgstr ""
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:824
 msgid "Column headers"
 msgstr ""
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:825
 msgid "Th_read view"
 msgstr ""
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:826 src/prefs_summaries.c:642
 msgid "Hide read threads"
 msgstr ""
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:827
 msgid "_Hide read messages"
 msgstr ""
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:828 src/prefs_summaries.c:648
 msgid "Hide deleted messages"
 msgstr ""
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:829
 msgid "_Fullscreen"
 msgstr ""
 
-#: src/mainwindow.c:829 src/messageview.c:343
+#: src/mainwindow.c:830 src/messageview.c:345
 msgid "Show all _headers"
 msgstr ""
 
-#: src/mainwindow.c:830 src/messageview.c:344
+#: src/mainwindow.c:831 src/messageview.c:346
 msgid "_Collapse all"
 msgstr ""
 
-#: src/mainwindow.c:831 src/messageview.c:345
+#: src/mainwindow.c:832 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr ""
 
-#: src/mainwindow.c:832 src/messageview.c:346
+#: src/mainwindow.c:833 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr ""
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:837
 msgid "Text _below icons"
 msgstr ""
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:838
 msgid "Text be_side icons"
 msgstr ""
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:839
 msgid "_Icons only"
 msgstr ""
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:840
 msgid "_Text only"
 msgstr ""
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:847
 msgid "_Standard"
 msgstr ""
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:848
 msgid "_Three columns"
 msgstr ""
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:849
 msgid "_Wide message"
 msgstr ""
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:850
 msgid "W_ide message list"
 msgstr ""
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:851
 msgid "S_mall screen"
 msgstr ""
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:855
 msgid "By _number"
 msgstr ""
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:856
 msgid "By s_ize"
 msgstr ""
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:857
 msgid "By _date"
 msgstr ""
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:858
 msgid "By thread date"
 msgstr ""
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:861
 msgid "By s_ubject"
 msgstr ""
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:862
 msgid "By _color label"
 msgstr "By _colour label"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:863
 msgid "By tag"
 msgstr ""
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:864
 msgid "By _mark"
 msgstr ""
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:865
 msgid "By _status"
 msgstr ""
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:866
 msgid "By a_ttachment"
 msgstr ""
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:867
 msgid "By score"
 msgstr ""
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:868
 msgid "By locked"
 msgstr ""
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:869
 msgid "D_on't sort"
 msgstr ""
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:455
+#: src/mainwindow.c:873 src/prefs_summaries.c:629
 msgid "Ascending"
 msgstr ""
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:456
+#: src/mainwindow.c:874 src/prefs_summaries.c:630
 msgid "Descending"
 msgstr ""
 
-#: src/mainwindow.c:915 src/messageview.c:388
+#: src/mainwindow.c:916 src/messageview.c:390
 msgid "_Auto detect"
 msgstr ""
 
-#: src/mainwindow.c:1312 src/summaryview.c:6218
+#: src/mainwindow.c:1294 src/summaryview.c:6436
 msgid "Apply tags..."
 msgstr ""
 
-#: src/mainwindow.c:1959
+#: src/mainwindow.c:1943
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
-#: src/mainwindow.c:1974
+#: src/mainwindow.c:1958
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1961
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
-#: src/mainwindow.c:1991
+#: src/mainwindow.c:1975
 msgid "Select account"
 msgstr ""
 
-#: src/mainwindow.c:2018 src/prefs_logging.c:140
+#: src/mainwindow.c:2002 src/prefs_logging.c:136
 msgid "Network log"
 msgstr ""
 
-#: src/mainwindow.c:2022
+#: src/mainwindow.c:2006
 msgid "Filtering/Processing debug log"
 msgstr ""
 
-#: src/mainwindow.c:2041 src/prefs_logging.c:392
+#: src/mainwindow.c:2025 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:394
+#: src/mainwindow.c:2027 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2486 src/mainwindow.c:2493 src/mainwindow.c:2536
-#: src/mainwindow.c:2569 src/mainwindow.c:2601 src/mainwindow.c:2646
+#: src/mainwindow.c:2461 src/mainwindow.c:2468 src/mainwindow.c:2511
+#: src/mainwindow.c:2544 src/mainwindow.c:2576 src/mainwindow.c:2621
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1053
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr ""
 
-#: src/mainwindow.c:2647 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2622 src/prefs_summary_open.c:114
 msgid "none"
 msgstr ""
 
-#: src/mainwindow.c:2904 src/mainwindow.c:2908
+#: src/mainwindow.c:2879 src/mainwindow.c:2884
 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 
-#: src/mainwindow.c:2905
+#: src/mainwindow.c:2880
 msgid "Don't quit"
 msgstr ""
 
-#: src/mainwindow.c:2934 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2911 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2935
+#: src/mainwindow.c:2912
 msgid ""
 "Input the location of mailbox.\n"
 "If an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 
-#: src/mainwindow.c:2941 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2918 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 
-#: src/mainwindow.c:2946 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:741
+#: src/mainwindow.c:2923 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:742
 msgid "Mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2951 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2928 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 
-#: src/mainwindow.c:3413
+#: src/mainwindow.c:3409
 msgid "No posting allowed"
 msgstr ""
 
-#: src/mainwindow.c:3996
+#: src/mainwindow.c:3991
 msgid "Mbox import has failed."
 msgstr ""
 
-#: src/mainwindow.c:4005 src/mainwindow.c:4014
+#: src/mainwindow.c:4000 src/mainwindow.c:4009
 msgid "Export to mbox has failed."
 msgstr ""
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4050 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr ""
 
-#: src/mainwindow.c:4055 src/plugins/notification/notification_trayicon.c:548
+#: src/mainwindow.c:4050 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr ""
 
-#: src/mainwindow.c:4246
+#: src/mainwindow.c:4251
 msgid "Folder synchronisation"
 msgstr ""
 
-#: src/mainwindow.c:4247
+#: src/mainwindow.c:4252
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
-#: src/mainwindow.c:4248
+#: src/mainwindow.c:4253
 msgid "_Synchronise"
 msgstr ""
 
-#: src/mainwindow.c:4689
+#: src/mainwindow.c:4698
 msgid "Deleting duplicated messages..."
 msgstr ""
 
-#: src/mainwindow.c:4726
+#: src/mainwindow.c:4708
+msgid "No duplicate message found in selected folder.\n"
+msgstr ""
+
+#: src/mainwindow.c:4714
+#, 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:4718
+#, 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:4756
+msgid "Deleting duplicated messages in all folders..."
+msgstr ""
+
+#: src/mainwindow.c:4762
 #, 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:4982 src/summaryview.c:5709
+#: src/mainwindow.c:4767
+#, c-format
+msgid "No duplicate message found in %d folders.\n"
+msgstr ""
+
+#: src/mainwindow.c:4929 src/messageview.c:2662
+msgid "Select folder to go to"
+msgstr ""
+
+#: src/mainwindow.c:5030 src/summaryview.c:5879
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: src/mainwindow.c:4990
+#: src/mainwindow.c:5038
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:4998 src/summaryview.c:5720
+#: src/mainwindow.c:5046 src/summaryview.c:5890
 msgid "Filtering configuration"
 msgstr ""
 
-#: src/mainwindow.c:5113
+#: src/mainwindow.c:5161
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 
-#: src/mainwindow.c:5172
+#: src/mainwindow.c:5220
 msgid "Claws Mail has been registered as default client."
 msgstr ""
 
-#: src/mainwindow.c:5174
+#: src/mainwindow.c:5222
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 
-#: src/mainwindow.c:5188 src/setup.c:91
+#: src/mainwindow.c:5236 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr ""
 
-#: src/mainwindow.c:5332
+#: src/mainwindow.c:5380
 #, 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:214 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:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
+#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
 #, c-format
 msgid "%s header"
 msgstr ""
 
-#: src/matcher.c:222
+#: src/matcher.c:225
 msgid "header"
 msgstr ""
 
-#: src/matcher.c:223
+#: src/matcher.c:226
 msgid "header line"
 msgstr ""
 
-#: src/matcher.c:224
+#: src/matcher.c:227
 msgid "body line"
 msgstr ""
 
-#: src/matcher.c:225
+#: src/matcher.c:228
 msgid "tag"
 msgstr ""
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:212 src/prefs_matcher.c:742 src/summary_search.c:466
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/message_search.c:214 src/prefs_matcher.c:748 src/summary_search.c:454
 msgid "Case sensitive"
 msgstr ""
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
 msgid "Case insensitive"
 msgstr ""
 
-#: src/matcher.c:1849
+#: src/matcher.c:1903
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr ""
 
-#: src/matcher.c:1920 src/matcher.c:1939 src/matcher.c:1952
+#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
 msgid "message matches\n"
 msgstr ""
 
-#: src/matcher.c:1927 src/matcher.c:1945 src/matcher.c:1954
+#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
 msgid "message does not match\n"
 msgstr ""
 
-#: src/matcher.c:2217 src/matcher.c:2218 src/matcher.c:2219 src/matcher.c:2220
-#: src/matcher.c:2221 src/matcher.c:2222 src/matcher.c:2223 src/matcher.c:2224
+#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
+#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
 msgid "(none)"
 msgstr ""
 
-#: src/mbox.c:107
+#: src/mbox.c:97
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"
 msgstr ""
 
-#: src/mbox.c:144
+#: src/mbox.c:134
 #, c-format
 msgid "Importing from mbox... (%d mail imported)"
 msgid_plural "Importing from mbox... (%d mails imported)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mbox.c:553
+#: src/mbox.c:539
 msgid "Overwrite mbox file"
 msgstr ""
 
-#: src/mbox.c:554
+#: src/mbox.c:540
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/mbox.c:555 src/messageview.c:1855 src/mimeview.c:1842
-#: src/prefs_themes.c:533 src/textview.c:3075
+#: src/mbox.c:541 src/messageview.c:1846 src/mimeview.c:1845
+#: src/prefs_themes.c:596 src/textview.c:3129
 msgid "Overwrite"
 msgstr ""
 
-#: src/mbox.c:564
+#: src/mbox.c:550
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
 msgstr ""
 
-#: src/mbox.c:572
+#: src/mbox.c:554
 msgid "Exporting to mbox..."
 msgstr ""
 
-#: src/message_search.c:162
+#: src/message_search.c:173
 msgid "Find in current message"
 msgstr ""
 
-#: src/message_search.c:180
+#: src/message_search.c:191
 msgid "Find text:"
 msgstr ""
 
-#: src/message_search.c:328 src/summary_search.c:779
+#: src/message_search.c:317 src/summary_search.c:778
 msgid "Search failed"
 msgstr ""
 
-#: src/message_search.c:329 src/summary_search.c:780
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search string not found."
 msgstr ""
 
-#: src/message_search.c:338
+#: src/message_search.c:327
 msgid "Beginning of message reached; continue from end?"
 msgstr ""
 
-#: src/message_search.c:341
+#: src/message_search.c:330
 msgid "End of message reached; continue from beginning?"
 msgstr ""
 
-#: src/message_search.c:344 src/summary_search.c:791
+#: src/message_search.c:333 src/summary_search.c:790
 msgid "Search finished"
 msgstr ""
 
-#: src/messageview.c:297 src/textview.c:238
+#: src/messageview.c:300 src/textview.c:253
 msgid "Compose _new message"
 msgstr ""
 
-#: src/messageview.c:713 src/messageview.c:1446 src/messageview.c:1597
+#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
 msgstr ""
 
-#: src/messageview.c:840
+#: src/messageview.c:845
 msgid "<No Return-Path found>"
 msgstr ""
 
-#: src/messageview.c:848
+#: src/messageview.c:852
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 "to be sent does not correspond to the return path:\n"
 "Notification address: %s\n"
 "Return path: %s\n"
-"It is advised to not to send the return receipt."
+"It is advised to not send the return receipt."
 msgstr ""
 
-#: src/messageview.c:855 src/messageview.c:872
+#: src/messageview.c:859
 msgid "_Don't Send"
 msgstr ""
 
-#: src/messageview.c:868
-msgid ""
-"This message is asking for a return receipt notification\n"
-"but according to its 'To:' and 'CC:' headers it was not\n"
-"officially addressed to you.\n"
-"It is advised to not to send the return receipt."
-msgstr ""
-
-#: src/messageview.c:1376
+#: src/messageview.c:1366
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr ""
 
-#: src/messageview.c:1412 src/procmime.c:1008
+#: src/messageview.c:1402 src/procmime.c:956
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
-#: src/messageview.c:1493 src/messageview.c:1501
+#: src/messageview.c:1483 src/messageview.c:1491
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 
-#: src/messageview.c:1847 src/messageview.c:1850 src/mimeview.c:1995
-#: src/plugins/fancy/fancy_viewer.c:663 src/summaryview.c:4811
-#: src/summaryview.c:4814 src/textview.c:3063
+#: src/messageview.c:1838 src/messageview.c:1841 src/mimeview.c:2050
+#: src/plugins/fancy/fancy_viewer.c:692 src/summaryview.c:4982
+#: src/summaryview.c:4985 src/textview.c:3117
 msgid "Save as"
 msgstr ""
 
-#: src/messageview.c:1856
+#: src/messageview.c:1847
 msgid "Overwrite existing file?"
 msgstr ""
 
-#: src/messageview.c:1864 src/summaryview.c:4831 src/summaryview.c:4834
-#: src/summaryview.c:4849
+#: src/messageview.c:1855 src/summaryview.c:5002 src/summaryview.c:5005
+#: src/summaryview.c:5020
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
-#: src/messageview.c:1917
+#: src/messageview.c:1908
 #, c-format
 msgid "Show all %s."
 msgstr ""
 
-#: src/messageview.c:1919
+#: src/messageview.c:1910
 msgid "Only the first megabyte of text is shown."
 msgstr ""
 
-#: src/messageview.c:1950
+#: src/messageview.c:1941
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 
-#: src/messageview.c:1953
+#: src/messageview.c:1944
 msgid "You asked for a return receipt in this message."
 msgstr ""
 
-#: src/messageview.c:1959
+#: src/messageview.c:1950
 msgid "This message asks for a return receipt."
 msgstr ""
 
-#: src/messageview.c:1960
+#: src/messageview.c:1951
 msgid "Send receipt"
 msgstr ""
 
-#: src/messageview.c:2003
+#: src/messageview.c:1994
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
-#: src/messageview.c:2009
+#: src/messageview.c:2000
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 
-#: src/messageview.c:2013 src/messageview.c:2035
+#: src/messageview.c:2004 src/messageview.c:2026
 msgid "Mark for download"
 msgstr ""
 
-#: src/messageview.c:2014 src/messageview.c:2026
+#: src/messageview.c:2005 src/messageview.c:2017
 msgid "Mark for deletion"
 msgstr ""
 
-#: src/messageview.c:2019
+#: src/messageview.c:2010
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 
-#: src/messageview.c:2024 src/messageview.c:2037
-#: src/prefs_filtering_action.c:180
+#: src/messageview.c:2015 src/messageview.c:2028
+#: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr ""
 
-#: src/messageview.c:2030
+#: src/messageview.c:2021
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 
-#: src/messageview.c:2103
-msgid "Return Receipt Notification"
+#: src/messageview.c:2098
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
+msgid ""
+"This message is asking for a return receipt notification\n"
+"but according to its '%s' and '%s' headers it was not\n"
+"officially addressed to you.\n"
+"It is advised to not send the return receipt."
 msgstr ""
 
-#: src/messageview.c:2104
-msgid ""
-"More than one of your accounts uses the address that this message was sent "
-"to.\n"
-"Please choose which account you want to use for sending the receipt "
-"notification:"
+#: src/messageview.c:2106 src/messageview.c:2114
+msgid "Return Receipt Notification"
 msgstr ""
 
-#: src/messageview.c:2108 src/plugins/rssyl/rssyl_feed_props.c:508
+#: src/messageview.c:2108 src/messageview.c:2119
+#: src/plugins/rssyl/rssyl_feed_props.c:496
 msgid "_Cancel"
 msgstr ""
 
-#: src/messageview.c:2108
+#: src/messageview.c:2108 src/messageview.c:2119
 msgid "_Send Notification"
 msgstr ""
 
-#: src/messageview.c:2197
+#: src/messageview.c:2115
+msgid ""
+"More than one of your accounts uses the address that this message was sent "
+"to.\n"
+"Please choose which account you want to use for sending the receipt "
+"notification:"
+msgstr ""
+
+#: src/messageview.c:2211
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
-#: src/messageview.c:2959
+#: src/messageview.c:2972
 msgid ""
 "\n"
 "  There are no messages in this folder"
 msgstr ""
 
-#: src/messageview.c:2967
+#: src/messageview.c:2980
 msgid ""
 "\n"
 "  Message has been deleted"
 msgstr ""
 
-#: src/messageview.c:2968
+#: src/messageview.c:2981
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:3001 src/messageview.c:3007 src/summaryview.c:4188
-#: src/summaryview.c:6987
+#: src/messageview.c:3014 src/messageview.c:3020 src/summaryview.c:4380
+#: src/summaryview.c:7204
 msgid "An error happened while learning.\n"
 msgstr ""
 
-#: src/mh.c:527
+#: src/mh.c:528
 msgid "Moving messages..."
 msgstr ""
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:839
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr ""
 
@@ -7679,114 +7837,155 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/mh_gtk.c:364 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 
-#: src/mh_gtk.c:366 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
 msgid "Remove mailbox"
 msgstr ""
 
-#: src/mimeview.c:192
+#: src/mimeview.c:193
 msgid "_Open"
 msgstr ""
 
-#: src/mimeview.c:194
+#: src/mimeview.c:195
 msgid "Open _with..."
 msgstr ""
 
-#: src/mimeview.c:196
+#: src/mimeview.c:197
 msgid "Send to..."
 msgstr ""
 
-#: src/mimeview.c:197
+#: src/mimeview.c:198
 msgid "_Display as text"
 msgstr ""
 
-#: src/mimeview.c:198
+#: src/mimeview.c:199
 msgid "_Save as..."
 msgstr ""
 
-#: src/mimeview.c:199
+#: src/mimeview.c:200
 msgid "Save _all..."
 msgstr ""
 
-#: src/mimeview.c:272
+#: src/mimeview.c:273
 msgid "MIME Type"
 msgstr ""
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1021 src/mimeview.c:1026 src/mimeview.c:1031
+#: src/mimeview.c:1036
 msgid "View full information"
 msgstr ""
 
-#: src/mimeview.c:1047
+#: src/mimeview.c:1042
 msgid "Check again"
 msgstr ""
 
-#: src/mimeview.c:1059
+#: src/mimeview.c:1054
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr ""
 
-#: src/mimeview.c:1061
+#: src/mimeview.c:1056
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr ""
 
-#: src/mimeview.c:1071
+#: src/mimeview.c:1066
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1068
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 
-#: src/mimeview.c:1313
+#: src/mimeview.c:1308
 msgid "Checking signature..."
 msgstr ""
 
-#: src/mimeview.c:1354
+#: src/mimeview.c:1349
 msgid "Go back to email"
 msgstr ""
 
-#: src/mimeview.c:1761 src/mimeview.c:1850 src/mimeview.c:2042
-#: src/mimeview.c:2078 src/mimeview.c:2190 src/plugins/fancy/fancy_viewer.c:416
+#: src/mimeview.c:1763 src/mimeview.c:1855 src/mimeview.c:2097
+#: src/mimeview.c:2133 src/mimeview.c:2245 src/plugins/fancy/fancy_viewer.c:440
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 
-#: src/mimeview.c:1839 src/textview.c:3073
+#: src/mimeview.c:1842 src/textview.c:3127
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr ""
 
-#: src/mimeview.c:1881 src/plugins/archive/archiver_prefs.c:126
+#: src/mimeview.c:1866
+#, c-format
+msgid ""
+"An error has occurred while saving message part #%d. Do you want to cancel "
+"operation or skip error and continue?"
+msgstr ""
+
+#: src/mimeview.c:1869
+msgid "Error saving all message parts"
+msgstr ""
+
+#: src/mimeview.c:1870
+msgid "Skip"
+msgstr ""
+
+#: src/mimeview.c:1870
+msgid "Skip all"
+msgstr ""
+
+#: src/mimeview.c:1880
+#, c-format
+msgid "%d file saved successfully."
+msgid_plural "%d files saved successfully."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mimeview.c:1888
+#, c-format
+msgid "%d file saved successfully"
+msgid_plural "%d files saved successfully"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mimeview.c:1893
+#, c-format
+msgid "%s, %d file failed."
+msgid_plural "%s, %d files failed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mimeview.c:1926 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1262
 msgid "Select destination folder"
 msgstr ""
 
-#: src/mimeview.c:1888 src/plugins/archive/archiver_prefs.c:132
+#: src/mimeview.c:1933 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr ""
 
-#: src/mimeview.c:2125 src/mimeview.c:2132 src/textview.c:2990
+#: src/mimeview.c:2180 src/mimeview.c:2187 src/textview.c:3044
 msgid "Open with"
 msgstr ""
 
-#: src/mimeview.c:2126 src/mimeview.c:2133 src/textview.c:2991
+#: src/mimeview.c:2181 src/mimeview.c:2188 src/textview.c:3045
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 
-#: src/mimeview.c:2228
+#: src/mimeview.c:2283
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -7794,11 +7993,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/mimeview.c:2236
+#: src/mimeview.c:2291
 msgid "Execute untrusted binary?"
 msgstr ""
 
-#: src/mimeview.c:2237
+#: src/mimeview.c:2292
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could probably lead to compromission of your computer.\n"
@@ -7806,96 +8005,96 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 
-#: src/mimeview.c:2241
+#: src/mimeview.c:2296
 msgid "Run binary"
 msgstr ""
 
-#: src/mimeview.c:2543 src/plugins/att_remover/att_remover.c:299
+#: src/mimeview.c:2599 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr ""
 
-#: src/mimeview.c:2544 src/plugins/att_remover/att_remover.c:300
-#: src/plugins/pdf_viewer/poppler_viewer.c:700 src/summaryview.c:2676
+#: src/mimeview.c:2600 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2755
 msgid "Size:"
 msgstr ""
 
-#: src/mimeview.c:2558 src/plugins/vcalendar/vcalendar.c:1274
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1722
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1732
+#: src/mimeview.c:2614 src/plugins/vcalendar/vcalendar.c:1254
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
 msgstr ""
 
-#: src/news.c:303
+#: src/news.c:300
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr ""
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr ""
 
-#: src/news.c:357
+#: src/news.c:371
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:438
+#: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr ""
 
-#: src/news.c:447
+#: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr ""
 
-#: src/news.c:451
+#: src/news.c:464
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr ""
 
-#: src/news.c:466
+#: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr ""
 
-#: src/news.c:491
+#: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr ""
 
-#: src/news.c:862
+#: src/news.c:875
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr ""
 
-#: src/news.c:1054 src/news.c:1224
+#: src/news.c:1067 src/news.c:1245
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr ""
 
-#: src/news.c:1063
+#: src/news.c:1076
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 
-#: src/news.c:1133 src/news.c:1157 src/news.c:1181
+#: src/news.c:1146 src/news.c:1173 src/news.c:1200
 msgid "couldn't get xhdr\n"
 msgstr ""
 
-#: src/news.c:1217
+#: src/news.c:1238
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
-#: src/news.c:1232
+#: src/news.c:1253
 msgid "couldn't get xover\n"
 msgstr ""
 
-#: src/news.c:1247
+#: src/news.c:1270
 msgid "invalid xover line\n"
 msgstr ""
 
-#: src/news.c:1449
+#: src/news.c:1472
 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"
@@ -7962,112 +8161,112 @@ msgstr ""
 msgid "Confirm passphrase:"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:51
+#: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:67
+#: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:207
-#: src/plugins/acpi_notifier/acpi_notifier.c:213
-#: src/plugins/acpi_notifier/acpi_notifier.c:425
+#: src/plugins/acpi_notifier/acpi_notifier.c:209
+#: src/plugins/acpi_notifier/acpi_notifier.c:215
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Control file doesn't exist."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : no new or unread mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : unread mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
-msgid " : new mail"
-msgstr ""
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:309
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-msgid "off"
+msgid " : new mail"
 msgstr ""
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:311
 #: src/plugins/acpi_notifier/acpi_notifier.c:317
 #: src/plugins/acpi_notifier/acpi_notifier.c:323
-msgid "blinking"
+msgid "off"
 msgstr ""
 
 #: src/plugins/acpi_notifier/acpi_notifier.c:313
 #: src/plugins/acpi_notifier/acpi_notifier.c:319
 #: src/plugins/acpi_notifier/acpi_notifier.c:325
+msgid "blinking"
+msgstr ""
+
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:327
 msgid "on"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:347
-#: src/plugins/acpi_notifier/acpi_notifier.c:356
-#: src/plugins/acpi_notifier/acpi_notifier.c:371
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:358
+#: src/plugins/acpi_notifier/acpi_notifier.c:373
 msgid "LED "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:386
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI type: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:395
+#: src/plugins/acpi_notifier/acpi_notifier.c:397
 msgid "ACPI file: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:406
+#: src/plugins/acpi_notifier/acpi_notifier.c:408
 msgid "values - On: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:411
+#: src/plugins/acpi_notifier/acpi_notifier.c:413
 msgid " - Off: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:433
+#: src/plugins/acpi_notifier/acpi_notifier.c:435
 msgid "Blink when user interaction is required"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:867
+#: src/plugins/acpi_notifier/acpi_notifier.c:869
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:888
+#: src/plugins/acpi_notifier/acpi_notifier.c:890
 msgid "Laptop LED"
 msgstr ""
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:256
+#: src/plugins/attachwarner/attachwarner.c:252
 msgid "Failed to register check before send hook"
 msgstr ""
 
@@ -8077,61 +8276,57 @@ msgstr ""
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:257
+#: src/plugins/address_keeper/address_keeper_prefs.c:274
 msgid "Address Keeper"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:106
+#: src/plugins/address_keeper/address_keeper_prefs.c:108
 msgid "Address book location"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:111
+#: src/plugins/address_keeper/address_keeper_prefs.c:113
 msgid "Keep to folder"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:119
+#: src/plugins/address_keeper/address_keeper_prefs.c:121
 msgid "Address book path where addresses are kept"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
-#: src/plugins/bogofilter/bogofilter_gtk.c:278
+#: src/plugins/address_keeper/address_keeper_prefs.c:123
+#: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:446
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:679
+#: src/plugins/spamassassin/spamassassin_gtk.c:463
+#: src/prefs_filtering_action.c:545 src/prefs_filtering_action.c:552
+#: src/prefs_matcher.c:686
 msgid "Select..."
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:137
+#: src/plugins/address_keeper/address_keeper_prefs.c:139
 msgid "Fields to keep addresses from"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:144
-msgid "Keep addresses which appear in 'To' headers"
-msgstr ""
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:153
-msgid "Keep addresses which appear in 'Cc' headers"
-msgstr ""
-
-#: src/plugins/address_keeper/address_keeper_prefs.c:162
-msgid "Keep addresses which appear in 'Bcc' headers"
+#: src/plugins/address_keeper/address_keeper_prefs.c:147
+#: src/plugins/address_keeper/address_keeper_prefs.c:161
+#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#, c-format
+msgctxt "address keeper: %s stands for a header name"
+msgid "Keep addresses which appear in '%s' headers"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:168
+#: src/plugins/address_keeper/address_keeper_prefs.c:185
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
 
-#: src/plugins/archive/archiver.c:43 src/plugins/archive/archiver_prefs.c:91
+#: src/plugins/archive/archiver.c:45 src/plugins/archive/archiver_prefs.c:107
 msgid "Mail Archiver"
 msgstr ""
 
-#: src/plugins/archive/archiver.c:54
+#: src/plugins/archive/archiver.c:56
 msgid "Create Archive..."
 msgstr ""
 
-#: src/plugins/archive/archiver.c:122
+#: src/plugins/archive/archiver.c:123
 #, c-format
 msgid ""
 "This plugin adds archiving features to Claws Mail.\n"
@@ -8142,11 +8337,7 @@ msgid ""
 "Several archiving options are also available.\n"
 "\n"
 "The archive can be stored as:\n"
-"\tTAR\n"
-"\tPAX\n"
-"\tSHAR\n"
-"\tCPIO\n"
-"\n"
+"%s\n"
 "The archive can be compressed using:\n"
 "%s\n"
 "The archives can be restored with any standard tool that supports the chosen "
@@ -8160,66 +8351,87 @@ msgid ""
 "Archiver"
 msgstr ""
 
-#: src/plugins/archive/archiver.c:152
+#: src/plugins/archive/archiver.c:170
 msgid "Archiver"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:104
+#: src/plugins/archive/archiver_gtk.c:108
 msgid "Archiving"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:122
+#: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:138
+#: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:507
-msgid "Folder and archive must be selected"
+#: src/plugins/archive/archiver_gtk.c:527
+#, c-format
+msgid ""
+"Some uninitialized data prevents from starting\n"
+"the archiving process:\n"
+"%s%s"
+msgstr ""
+
+#: src/plugins/archive/archiver_gtk.c:530
+msgid ""
+"\n"
+"- the folder to archive is not set"
+msgstr ""
+
+#: src/plugins/archive/archiver_gtk.c:531
+msgid ""
+"\n"
+"- the name for archive is not set"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:516
+#: src/plugins/archive/archiver_gtk.c:554
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:519
+#: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:522
+#: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:565
+#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:621
+msgid "Creating archive"
+msgstr ""
+
+#: src/plugins/archive/archiver_gtk.c:587
 #, c-format
 msgid ""
 "Not a valid file name:\n"
 "%s."
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:578
+#: src/plugins/archive/archiver_gtk.c:592
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
 "%s."
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:607
+#: src/plugins/archive/archiver_gtk.c:616
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8229,273 +8441,268 @@ msgid ""
 "Continue anyway?"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:709
+#: src/plugins/archive/archiver_gtk.c:633
+#, c-format
+msgid ""
+"Archive creation error:\n"
+"%s"
+msgstr ""
+
+#: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:739
+#: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:748
+#: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:754
+#: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:761
+#: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:777
+#: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:785
+#: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:794
+#: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
-#: src/plugins/pdf_viewer/poppler_viewer.c:719 src/prefs_folder_item.c:507
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
+#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
 msgid "Yes"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:799
-#: src/plugins/archive/archiver_gtk.c:807
-#: src/plugins/archive/archiver_gtk.c:815
-#: src/plugins/pdf_viewer/poppler_viewer.c:722 src/prefs_folder_item.c:506
-#: src/prefs_summaries.c:372
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/prefs_summaries.c:405
 msgid "No"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:802
+#: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:810
+#: src/plugins/archive/archiver_gtk.c:848
 msgid "Descriptive names"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:818
+#: src/plugins/archive/archiver_gtk.c:856
 msgid "Delete selected files"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:827
-#: src/plugins/archive/archiver_gtk.c:1203
+#: src/plugins/archive/archiver_gtk.c:865
+#: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:903
+#: src/plugins/archive/archiver_gtk.c:921
+msgid "Select folder to archive"
+msgstr ""
+
+#: src/plugins/archive/archiver_gtk.c:942
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:951
+#: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:988
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1003
+#: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1016
+#: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1023
+#: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1028
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1034
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1040
+#: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1042
-#: src/plugins/archive/archiver_prefs.c:194
-#: src/plugins/pgpcore/select-keys.c:421
+#: src/plugins/archive/archiver_gtk.c:1098
+#: src/plugins/archive/archiver_prefs.c:225
+#: src/plugins/pgpcore/select-keys.c:493
 msgid "_Select"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1045
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Click this button to select a name and location for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1047
+#: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1060
-msgid "Choose this option to use ZIP compression for the archive"
-msgstr ""
-
-#: src/plugins/archive/archiver_gtk.c:1067
-msgid "Choose this option to use BZIP2 compression for the archive"
-msgstr ""
-
-#: src/plugins/archive/archiver_gtk.c:1074
-msgid "Choose this to use Compress compression for your archive"
-msgstr ""
-
-#: src/plugins/archive/archiver_gtk.c:1081
-msgid "Choose this option to disable compression for the archive"
-msgstr ""
-
-#: src/plugins/archive/archiver_gtk.c:1101
-msgid "Choose format"
-msgstr ""
-
-#: src/plugins/archive/archiver_gtk.c:1114
-msgid "Choose this option to use TAR as format for the archive"
-msgstr ""
-
+#: src/plugins/archive/archiver_gtk.c:1115
 #: src/plugins/archive/archiver_gtk.c:1121
-msgid "Choose this to use SHAR as format for the archive"
+#: src/plugins/archive/archiver_gtk.c:1127
+#: src/plugins/archive/archiver_gtk.c:1134
+#: src/plugins/archive/archiver_gtk.c:1140
+#: src/plugins/archive/archiver_gtk.c:1148
+#: src/plugins/archive/archiver_gtk.c:1156
+#: src/plugins/archive/archiver_gtk.c:1162
+#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1176
+#: src/plugins/archive/archiver_gtk.c:1183
+#, c-format
+msgid "Choose this option to use %s compression for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1128
-msgid "Choose this option to use CPIO as format for the archive"
+#: src/plugins/archive/archiver_gtk.c:1232
+msgid "Choose format"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1135
-msgid "Choose this option to use PAX as format for the archive"
+#: src/plugins/archive/archiver_gtk.c:1244
+#: src/plugins/archive/archiver_gtk.c:1250
+#: src/plugins/archive/archiver_gtk.c:1256
+#: src/plugins/archive/archiver_gtk.c:1262
+#, c-format
+msgid "Choose this to use %s as format for the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1155
+#: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1164
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid "Choose this option to include subfolders in the archive"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1170
+#: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1174
+#: src/plugins/archive/archiver_gtk.c:1301
 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:1178
+#: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1182
-#: src/plugins/archive/archiver_prefs.c:325
+#: src/plugins/archive/archiver_gtk.c:1309
+#: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
 "The naming scheme: date_from at to@subject.\n"
 "Names will be truncated to max 96 characters"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1190
+#: src/plugins/archive/archiver_gtk.c:1317
 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:1194
+#: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
 msgstr ""
 
-#: src/plugins/archive/archiver_gtk.c:1210
+#: src/plugins/archive/archiver_gtk.c:1337
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:186
+#: src/plugins/archive/archiver_prefs.c:217
 msgid "Default save folder"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:198
+#: src/plugins/archive/archiver_prefs.c:229
 msgid "Click this button to select the default location for saving archives"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:207
+#: src/plugins/archive/archiver_prefs.c:238
 msgid "Default compression"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:219
-msgid "Choose this option to use ZIP compression by default"
-msgstr ""
-
-#: src/plugins/archive/archiver_prefs.c:226
-msgid "Choose this option to use BZIP2 compression by default"
-msgstr ""
-
-#: src/plugins/archive/archiver_prefs.c:233
-msgid "Choose this option to use COMPRESS compression by default"
-msgstr ""
-
-#: src/plugins/archive/archiver_prefs.c:240
-msgid "Choose this option to disable compression by default"
+#: src/plugins/archive/archiver_prefs.c:249
+#: src/plugins/archive/archiver_prefs.c:255
+#: src/plugins/archive/archiver_prefs.c:261
+#: src/plugins/archive/archiver_prefs.c:268
+#: src/plugins/archive/archiver_prefs.c:274
+#: src/plugins/archive/archiver_prefs.c:282
+#: src/plugins/archive/archiver_prefs.c:290
+#: src/plugins/archive/archiver_prefs.c:296
+#: src/plugins/archive/archiver_prefs.c:302
+#: src/plugins/archive/archiver_prefs.c:310
+#: src/plugins/archive/archiver_prefs.c:317
+#, c-format
+msgid "Choose this option to use %s compression by default"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:257
+#: src/plugins/archive/archiver_prefs.c:363
 msgid "Default format"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:269
-msgid "Choose this option to use the TAR format by default"
-msgstr ""
-
-#: src/plugins/archive/archiver_prefs.c:276
-msgid "Choose this option to use the SHAR format by default"
-msgstr ""
-
-#: src/plugins/archive/archiver_prefs.c:283
-msgid "Choose this option to use the CPIO format by default"
-msgstr ""
-
-#: src/plugins/archive/archiver_prefs.c:290
-msgid "Choose this option to use the PAX format by default"
+#: src/plugins/archive/archiver_prefs.c:374
+#: src/plugins/archive/archiver_prefs.c:380
+#: src/plugins/archive/archiver_prefs.c:386
+#: src/plugins/archive/archiver_prefs.c:392
+#, c-format
+msgid "Choose this option to use the %s as format by default"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:307
+#: src/plugins/archive/archiver_prefs.c:409
 msgid "Default miscellaneous options"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:316
+#: src/plugins/archive/archiver_prefs.c:418
 msgid "Choose this option to include subfolders in the archives by default"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:317
+#: src/plugins/archive/archiver_prefs.c:419
 msgid "MD5sum"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:319
+#: src/plugins/archive/archiver_prefs.c:421
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archives by "
 "default.\n"
@@ -8503,54 +8710,68 @@ msgid ""
 "will take to create the archives"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:323
-#: src/plugins/managesieve/sieve_manager.c:761
+#: src/plugins/archive/archiver_prefs.c:425
+#: src/plugins/managesieve/sieve_manager.c:769
 msgid "Rename"
 msgstr ""
 
-#: src/plugins/archive/archiver_prefs.c:331
+#: src/plugins/archive/archiver_prefs.c:433
 msgid "Choose this option to delete mails after archiving"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:332
+#: src/plugins/att_remover/att_remover.c:337
 msgid "Remove attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:357
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:944
+#: src/plugins/att_remover/att_remover.c:362
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:365 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:80 src/summaryview.c:2770
+#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:618
+#: src/prefs_summary_column.c:79 src/summaryview.c:2849
 msgid "Attachment"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:417
+#: src/plugins/att_remover/att_remover.c:424
 msgid "Destroy attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:418
+#: src/plugins/att_remover/att_remover.c:425
 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:479
+#: src/plugins/att_remover/att_remover.c:468
+msgid "The selected messages don't have any attachments."
+msgstr ""
+
+#: src/plugins/att_remover/att_remover.c:471
+#, c-format
+msgid "Attachments removed from %d of the %d selected messages."
+msgstr ""
+
+#: src/plugins/att_remover/att_remover.c:474
+#, c-format
+msgid "Attachments removed from all %d selected messages."
+msgstr ""
+
+#: src/plugins/att_remover/att_remover.c:503
 msgid "This message doesn't have any attachments."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:494
+#: src/plugins/att_remover/att_remover.c:516
 msgid "Remove attachments..."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:506
-#: src/plugins/att_remover/att_remover.c:566
+#: src/plugins/att_remover/att_remover.c:528
+#: src/plugins/att_remover/att_remover.c:588
 msgid "AttRemover"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:593
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -8558,11 +8779,11 @@ msgid ""
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:595
+#: src/plugins/att_remover/att_remover.c:617
 msgid "Attachment handling"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/attachwarner/attachwarner.c:210
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -8571,17 +8792,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:216
 msgid "Attachment warning"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner.c:249
-#: src/plugins/attachwarner/attachwarner.c:286
-#: src/plugins/attachwarner/attachwarner.c:338
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner.c:296
+#: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -8623,7 +8844,7 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:362
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:308
 msgid "Signatures"
 msgstr ""
 
@@ -8645,20 +8866,37 @@ msgstr ""
 msgid "Attach Warner"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:81
-#: src/plugins/bogofilter/bogofilter_gtk.c:499
+#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:483
+#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:331
+#: src/plugins/bogofilter/bogofilter_gtk.c:408
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
+#: src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin_gtk.c:459
+#: src/plugins/spamassassin/spamassassin_gtk.c:508
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:682
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1657 src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1672 src/prefs_matcher.c:1674 src/prefs_matcher.c:2582
+#: src/prefs_matcher.c:2586
+msgid "Any"
+msgstr ""
+
+#: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:496
+#: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:612
+#: src/plugins/bogofilter/bogofilter.c:586
 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"
@@ -8666,35 +8904,35 @@ msgid ""
 "with a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:619
+#: src/plugins/bogofilter/bogofilter.c:593
 #, 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:766
+#: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:779
-#: src/plugins/bogofilter/bogofilter.c:826 src/plugins/bsfilter/bsfilter.c:513
+#: src/plugins/bogofilter/bogofilter.c:753
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:794
+#: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:882
+#: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
 "%s"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1010
+#: src/plugins/bogofilter/bogofilter.c:984
 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 "
@@ -8710,130 +8948,130 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1043 src/plugins/bsfilter/bsfilter.c:676
-#: src/plugins/spamassassin/spamassassin.c:651
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:643
 msgid "Spam detection"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter.c:1044 src/plugins/bsfilter/bsfilter.c:677
-#: src/plugins/spamassassin/spamassassin.c:652
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:644
 msgid "Spam learning"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:399
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 msgid "Process messages on receiving"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:374
 msgid "Maximum size"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:366
+#: src/plugins/spamassassin/spamassassin_gtk.c:383
 msgid "Messages larger than this will not be checked"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:369 src/prefs_account.c:1511
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1636
 msgid "KB"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:200
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:195
 msgid "Save spam in..."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "Only mark as spam"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:227
+#: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:415
+#: src/plugins/spamassassin/spamassassin_gtk.c:432
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
 "Folder for storing identified spam. Leave empty to use the wastebin folder."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:233
+#: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:421
+#: src/plugins/spamassassin/spamassassin_gtk.c:438
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
 msgid "When unsure, move to"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:250
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
 msgid ""
 "Folder for storing mail for which spam status is Unsure. Leave empty to use "
 "the Inbox folder."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:240
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "Insert X-Bogosity header"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:262
+#: src/plugins/bogofilter/bogofilter_gtk.c:246
 msgid "Only done for messages in MH folders"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:268
+#: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:436
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
 msgid "Whitelist senders found in address book/folder"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:272
+#: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:440
+#: src/plugins/spamassassin/spamassassin_gtk.c:457
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:450
+#: src/plugins/spamassassin/spamassassin_gtk.c:467
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:284
+#: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:286
+#: src/plugins/bogofilter/bogofilter_gtk.c:270
 msgid ""
 "If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:295
+#: src/plugins/bogofilter/bogofilter_gtk.c:279
 msgid "Bogofilter call"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:303
+#: src/plugins/bogofilter/bogofilter_gtk.c:287
 msgid "Path to bogofilter executable"
 msgstr ""
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:309
+#: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:428
+#: src/plugins/spamassassin/spamassassin_gtk.c:445
 msgid "Mark spam as read"
 msgstr ""
 
@@ -8841,15 +9079,15 @@ msgstr ""
 msgid "Bsfilter"
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:300
+#: src/plugins/bsfilter/bsfilter.c:273
 msgid "Bsfilter: fetching body..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:309
+#: src/plugins/bsfilter/bsfilter.c:282
 msgid "Bsfilter: filtering message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:394
+#: src/plugins/bsfilter/bsfilter.c:367
 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"
@@ -8857,18 +9095,18 @@ msgid ""
 "a few hundred spam and ham messages."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:401
+#: src/plugins/bsfilter/bsfilter.c:374
 #, c-format
 msgid ""
 "The Bsfilter plugin couldn't filter a message. The command `%s` couldn't be "
 "run."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:502
+#: src/plugins/bsfilter/bsfilter.c:475
 msgid "Bsfilter: learning from message..."
 msgstr ""
 
-#: src/plugins/bsfilter/bsfilter.c:643
+#: src/plugins/bsfilter/bsfilter.c:616
 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 "
@@ -8885,7 +9123,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:407
+#: src/plugins/spamassassin/spamassassin_gtk.c:424
 msgid "Save spam in"
 msgstr ""
 
@@ -8904,7 +9142,7 @@ msgid "Path to bsfilter executable"
 msgstr ""
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:553
+#: src/plugins/clamd/clamav_plugin_gtk.c:538
 msgid "Clam AntiVirus"
 msgstr ""
 
@@ -8943,25 +9181,25 @@ msgstr ""
 msgid "ClamAV: scanning message..."
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:275
+#: src/plugins/clamd/clamav_plugin.c:280
 msgid "Failed to register mail filtering hook"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:293
+#: src/plugins/clamd/clamav_plugin.c:298
 msgid ""
 "Init\n"
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:297
+#: src/plugins/clamd/clamav_plugin.c:302
 msgid ""
 "Init\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:328
+#: src/plugins/clamd/clamav_plugin.c:333
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
@@ -8984,143 +9222,147 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin.c:367
+#: src/plugins/clamd/clamav_plugin.c:372
 msgid "Virus detection"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:249
+#: src/plugins/clamd/clamav_plugin_gtk.c:72
+msgid "Select folder to store infected messages in"
+msgstr ""
+
+#: src/plugins/clamd/clamav_plugin_gtk.c:248
 msgid "Enable virus scanning"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:259
+#: src/plugins/clamd/clamav_plugin_gtk.c:258
 msgid "Maximum attachment size"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:270
+#: src/plugins/clamd/clamav_plugin_gtk.c:269
 msgid "Message attachments larger than this will not be scanned"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:274
+#: src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:283
+#: src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:287
+#: src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/clamd/clamav_plugin_gtk.c:292
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
 "Folder for storing infected mail. Leave empty to use the default wastebin "
 "folder"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:303
+#: src/plugins/clamd/clamav_plugin_gtk.c:299
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:311
+#: src/plugins/clamd/clamav_plugin_gtk.c:306
 msgid "Automatic configuration"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:316
+#: src/plugins/clamd/clamav_plugin_gtk.c:311
 msgid "Should configuration be done automatic or manual"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:324
+#: src/plugins/clamd/clamav_plugin_gtk.c:318
 msgid "Where is clamd.conf"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:332
+#: src/plugins/clamd/clamav_plugin_gtk.c:326
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:336
+#: src/plugins/clamd/clamav_plugin_gtk.c:329
 msgid "Br_owse"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:340
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid "Click this button to select full path to clamd.conf"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:348
+#: src/plugins/clamd/clamav_plugin_gtk.c:340
 msgid "Check permission for folders and adjust if necessary"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:361
+#: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:369
+#: src/plugins/clamd/clamav_plugin_gtk.c:360
 msgid "Remote Host"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:377
+#: src/plugins/clamd/clamav_plugin_gtk.c:368
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:399
+#: src/plugins/clamd/clamav_plugin_gtk.c:387
 msgid "Port number where clamav daemon is listening"
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:528
+#: src/plugins/clamd/clamav_plugin_gtk.c:513
 msgid ""
 "New config\n"
 "No socket information.\n"
 "Antivirus disabled."
 msgstr ""
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:532
+#: src/plugins/clamd/clamav_plugin_gtk.c:517
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
 "Is clamd running?"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:117
+#: src/plugins/clamd/libclamd/clamd-plugin.c:122
 #, c-format
 msgid ""
 "%s: Unable to open\n"
 "clamd will be disabled"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:215
+#: src/plugins/clamd/libclamd/clamd-plugin.c:217
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
 "clamd will be disabled"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:249
+#: src/plugins/clamd/libclamd/clamd-plugin.c:251
 msgid "Could not create socket"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:422
+#: src/plugins/clamd/libclamd/clamd-plugin.c:442
 msgid ": File does not exist"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:435
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
 msgid ": Unable to open"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:455
-#: src/plugins/clamd/libclamd/clamd-plugin.c:460
 #: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:467
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
 msgid "%s: Error reading"
 msgstr ""
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:481
+#: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
 msgstr ""
 
@@ -9140,63 +9382,64 @@ msgid ""
 "It is not really useful."
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:146
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Display embedded images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:151
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Execute embedded javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:156
+#: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute Java applets"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:158
 msgid "Execute embedded Java applets"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:161
+#: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render objects using plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Render embedded objects using plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:169
+#: src/plugins/fancy/fancy_prefs.c:170
 msgid "Open in viewer (remote content is enabled)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:172
+#: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:209
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3944
+#: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:211
+#: src/plugins/fancy/fancy_prefs.c:212
 msgid "Use GNOME's proxy settings"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:219
+#: src/plugins/fancy/fancy_prefs.c:220
 msgid "Use proxy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:237
+#: src/plugins/fancy/fancy_prefs.c:238
 msgid "Remote resources"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/fancy/fancy_prefs.c:239
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -9205,121 +9448,121 @@ msgid ""
 "in the email."
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:244
+#: src/plugins/fancy/fancy_prefs.c:245
 msgid "Enable loading of remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:276
+#: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:284
+#: src/plugins/fancy/fancy_prefs.c:285
 msgid "Open in external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:298
+#: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:308
-#: src/plugins/notification/notification_prefs.c:1347
-#: src/plugins/pgpcore/prefs_gpg.c:189 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1445 src/prefs_account.c:1534 src/prefs_account.c:2008
-#: src/prefs_customheader.c:236
+#: src/plugins/fancy/fancy_prefs.c:309
+#: src/plugins/notification/notification_prefs.c:1346
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1570 src/prefs_account.c:1659 src/prefs_account.c:2210
+#: src/prefs_customheader.c:235
 msgid "Bro_wse"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:350
+#: src/plugins/fancy/fancy_prefs.c:351
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:387
+#: src/plugins/fancy/fancy_viewer.c:409
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:464
+#: src/plugins/fancy/fancy_viewer.c:488
 msgid "Load images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:466
+#: src/plugins/fancy/fancy_viewer.c:490
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:468
+#: src/plugins/fancy/fancy_viewer.c:492
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:470
+#: src/plugins/fancy/fancy_viewer.c:494
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:472
+#: src/plugins/fancy/fancy_viewer.c:496
 msgid "Enable Java"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:474
+#: src/plugins/fancy/fancy_viewer.c:498
 msgid "Open links with external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:643
+#: src/plugins/fancy/fancy_viewer.c:672
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:699
+#: src/plugins/fancy/fancy_viewer.c:728
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:710
+#: src/plugins/fancy/fancy_viewer.c:739
 msgid "Search the Web"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:722
+#: src/plugins/fancy/fancy_viewer.c:751
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:724
+#: src/plugins/fancy/fancy_viewer.c:753
 msgid "Open in Viewer (enable remote content)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:762
 msgid "Open in Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:743
+#: src/plugins/fancy/fancy_viewer.c:772
 msgid "Open Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:752
+#: src/plugins/fancy/fancy_viewer.c:781
 msgid "Copy Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Download Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:767
+#: src/plugins/fancy/fancy_viewer.c:796
 msgid "Save Image As"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:777
+#: src/plugins/fancy/fancy_viewer.c:806
 msgid "Copy Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:795
+#: src/plugins/fancy/fancy_viewer.c:846
 msgid "Import feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1007
+#: src/plugins/fancy/fancy_viewer.c:1128
 msgid "Fancy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1035
+#: src/plugins/fancy/fancy_viewer.c:1156
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1040
+#: src/plugins/fancy/fancy_viewer.c:1161
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9327,17 +9570,17 @@ msgid ""
 "Configuration/Preferences/Plugins/Fancy"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:200
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:161
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:194
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:182
 msgid "Fetchinfo"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:173
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:167
 msgid "Failed to register mail receive hook"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:209
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:203
 msgid ""
 "This plugin modifies the downloaded messages. It inserts headers containing "
 "some download information: UIDL, Claws Mail account name, POP server, user "
@@ -9346,7 +9589,7 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo"
 msgstr ""
 
-#: src/plugins/fetchinfo/fetchinfo_plugin.c:236
+#: src/plugins/fetchinfo/fetchinfo_plugin.c:230
 msgid "Mail marking"
 msgstr ""
 
@@ -9401,11 +9644,11 @@ msgid ""
 "RFC822 format"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:127
+#: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:129
+#: 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"
@@ -9416,29 +9659,29 @@ msgid ""
 "list."
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:144
+#: src/plugins/gdata/cm_gdata_contacts.c:147
 msgid "Step 1:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:150
+#: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Click here to open the Google authorization page in a browser"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:154
+#: src/plugins/gdata/cm_gdata_contacts.c:157
 msgid "Step 2:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:160
+#: src/plugins/gdata/cm_gdata_contacts.c:163
 msgid "Enter code:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:326
+#: src/plugins/gdata/cm_gdata_contacts.c:329
 #, 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:342
+#: src/plugins/gdata/cm_gdata_contacts.c:345
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -9446,73 +9689,85 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:344
+#: src/plugins/gdata/cm_gdata_contacts.c:347
 #, 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:354
+#: src/plugins/gdata/cm_gdata_contacts.c:357
 msgid "GData plugin: Starting async contacts query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:375
+#: src/plugins/gdata/cm_gdata_contacts.c:378
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:412
+#: src/plugins/gdata/cm_gdata_contacts.c:415
 msgid "GData plugin: Groups received\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:419
+#: src/plugins/gdata/cm_gdata_contacts.c:422
 msgid "GData plugin: Starting async groups query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:444
+#: src/plugins/gdata/cm_gdata_contacts.c:447
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:451
+#: src/plugins/gdata/cm_gdata_contacts.c:454
 msgid "GData plugin: Authorization successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:461
+#: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:471
+#: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:478
+#: src/plugins/gdata/cm_gdata_contacts.c:488
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:495
+#: src/plugins/gdata/cm_gdata_contacts.c:494
+msgid ""
+"GData plugin: Interactive authorization still running, no additional session "
+"started\n"
+msgstr ""
+
+#: src/plugins/gdata/cm_gdata_contacts.c:511
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:504
+#: src/plugins/gdata/cm_gdata_contacts.c:535
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:560
+#: src/plugins/gdata/cm_gdata_contacts.c:595
+#, c-format
+msgid ""
+"GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
+msgstr ""
+
+#: src/plugins/gdata/cm_gdata_contacts.c:603
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1752
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1941
 msgid "Authentication"
 msgstr ""
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1561
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
 msgid "Username:"
 msgstr ""
 
@@ -9552,30 +9807,30 @@ msgstr ""
 msgid "GData integration"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:374
-#: src/plugins/libravatar/libravatar.c:439
-#: src/plugins/libravatar/libravatar.c:499
+#: src/plugins/libravatar/libravatar.c:332
+#: src/plugins/libravatar/libravatar.c:397
+#: src/plugins/libravatar/libravatar.c:457
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:381
+#: src/plugins/libravatar/libravatar.c:339
 msgid "Failed to register avatar header update hook"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:390
+#: src/plugins/libravatar/libravatar.c:348
 msgid "Failed to register avatar image render hook"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:396
+#: src/plugins/libravatar/libravatar.c:354
 msgid "Failed to create avatar image cache directory"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:406
+#: src/plugins/libravatar/libravatar.c:364
 msgid "Failed to load missing items cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:449
+#: src/plugins/libravatar/libravatar.c:407
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -9656,8 +9911,9 @@ msgstr ""
 msgid "Cache refresh interval"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:229 src/prefs_account.c:1490
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1615
+#: src/prefs_account.c:1772 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr ""
 
@@ -9789,65 +10045,70 @@ msgid ""
 "Do you really want to delete?"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:436
 msgid "No Sieve auth method available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:440
 msgid "Selected Sieve auth method not available\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:673
 msgid "Disconnected"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:677
 #, c-format
 msgid "Disconnected: %s"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:724
-#: src/plugins/managesieve/managesieve.c:869
+#: src/plugins/managesieve/managesieve.c:726
+#: src/plugins/managesieve/managesieve.c:871
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:731
-msgid "TLS failed"
+#: src/plugins/managesieve/managesieve.c:733
+msgid "STARTTLS failed"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:796
-#: src/plugins/managesieve/managesieve.c:812
-#: src/plugins/managesieve/managesieve.c:839
-#: src/plugins/managesieve/managesieve.c:921
-#: src/plugins/managesieve/managesieve.c:939
+#: src/plugins/managesieve/managesieve.c:798
+#: src/plugins/managesieve/managesieve.c:814
+#: src/plugins/managesieve/managesieve.c:841
+#: src/plugins/managesieve/managesieve.c:923
+#: src/plugins/managesieve/managesieve.c:941
 msgid "error occurred on SIEVE session\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:865
+#: src/plugins/managesieve/managesieve.c:867
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:874
+#: src/plugins/managesieve/managesieve.c:876
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1131
+#: src/plugins/managesieve/managesieve.c:1152
 msgid "Sieve: retrying auth\n"
 msgstr ""
 
-#: src/plugins/managesieve/managesieve.c:1133
+#: src/plugins/managesieve/managesieve.c:1154
 msgid "Auth method not available"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5607
+#: src/plugins/managesieve/managesieve.c:1171
+#, c-format
+msgid "sending error on Sieve session: %s\n"
+msgstr ""
+
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5776
 msgid "_Filter"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:630
+#: src/plugins/managesieve/sieve_editor.c:632
 msgid "Chec_k Syntax"
 msgstr ""
 
@@ -9856,7 +10117,7 @@ msgid "Re_vert"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:722
+#: src/plugins/managesieve/sieve_editor.c:724
 #: src/plugins/managesieve/sieve_manager.c:182
 msgid "Unable to get script contents"
 msgstr ""
@@ -9889,22 +10150,22 @@ msgstr ""
 msgid "Checking syntax..."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:432
+#: src/plugins/managesieve/sieve_editor.c:433
 msgid "This script has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:693
+#: src/plugins/managesieve/sieve_editor.c:695
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1275
+#: src/plugins/managesieve/sieve_editor.c:744
+#: src/plugins/pdf_viewer/poppler_viewer.c:1315
 msgid "Loading..."
 msgstr ""
 
 #: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:241
+#: src/plugins/managesieve/sieve_manager.c:245
 msgid "Add Sieve script"
 msgstr ""
 
@@ -9912,44 +10173,44 @@ msgstr ""
 msgid "Enter name for a new Sieve filter script."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:242
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Enter new name for the script."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:323
+#: src/plugins/managesieve/sieve_manager.c:327
 #, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:324
+#: src/plugins/managesieve/sieve_manager.c:328
 msgid "Delete filter"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:478
+#: src/plugins/managesieve/sieve_manager.c:482
 msgid "Active"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:489
+#: src/plugins/managesieve/sieve_manager.c:493
 msgid "An account can only have one active script at a time."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:576
+#: src/plugins/managesieve/sieve_manager.c:580
 msgid "Unable to connect"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:620
+#: src/plugins/managesieve/sieve_manager.c:627
 msgid "Listing scripts..."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:630
 msgid "Connecting..."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:655
+#: src/plugins/managesieve/sieve_manager.c:662
 msgid "Manage Sieve Filters"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_manager.c:796
+#: src/plugins/managesieve/sieve_manager.c:804
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr ""
 
@@ -9970,107 +10231,109 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1090
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1190
 msgid "Server information"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:163
 msgid "Server name"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:183
 msgid "Connect to this port instead of the default"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:187
 msgid "Encryption"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:194
-msgid "No TLS"
+#: src/plugins/managesieve/sieve_prefs.c:190
+msgid "No encryption"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:196
-msgid "Use TLS when available"
+#: src/plugins/managesieve/sieve_prefs.c:192
+msgid "Use STARTTLS when available"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:198
-msgid "Require TLS"
+#: src/plugins/managesieve/sieve_prefs.c:194
+msgid "Require STARTTLS"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:264
+#: src/plugins/managesieve/sieve_prefs.c:202
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "No authentication"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:204
 msgid "Use same authentication as for receiving mail"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:206
 msgid "Specify authentication"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:240
-#: src/plugins/vcalendar/vcal_prefs.c:348
-#: src/plugins/vcalendar/vcal_prefs.c:467 src/prefs_account.c:1275
-#: src/prefs_account.c:1798
+#: src/plugins/managesieve/sieve_prefs.c:236
+#: src/plugins/vcalendar/vcal_prefs.c:391
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1385
+#: src/prefs_account.c:1987
 msgid "User ID"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:395
-#: src/plugins/vcalendar/vcal_prefs.c:356
-#: src/plugins/vcalendar/vcal_prefs.c:475 src/prefs_account.c:1281
-#: src/prefs_account.c:1818 src/prefs_account.c:2535 src/prefs_account.c:2557
-#: src/wizard.c:1215 src/wizard.c:1635
+#: src/plugins/managesieve/sieve_prefs.c:246
+#: src/plugins/rssyl/rssyl_feed_props.c:383
+#: src/plugins/vcalendar/vcal_prefs.c:399
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1391
+#: src/prefs_account.c:2010 src/prefs_account.c:2738 src/prefs_account.c:2766
+#: src/prefs_account.c:2963 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/wizard.c:1636
 msgid "Password"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1573
-#: src/prefs_account.c:1770
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1698
+#: src/prefs_account.c:1959
 msgid "Authentication method"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1583
-#: src/prefs_account.c:1779 src/prefs_send.c:233 src/prefs_send.c:304
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1708
+#: src/prefs_account.c:1968 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:391
+#: src/plugins/managesieve/sieve_prefs.c:390
 msgid "Sieve server must not contain a space."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:397
+#: src/plugins/managesieve/sieve_prefs.c:396
 msgid "Sieve server is not entered."
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:425
+#: src/plugins/managesieve/sieve_prefs.c:424
 msgid "Sieve"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:128
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:141
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10081,19 +10344,19 @@ msgid ""
 "Current log is %s"
 msgstr ""
 
-#: src/plugins/newmail/newmail.c:175
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr ""
 
-#: src/plugins/notification/notification_banner.c:356
+#: src/plugins/notification/notification_banner.c:357
 msgid "Folder:"
 msgstr ""
 
-#: src/plugins/notification/notification_foldercheck.c:478
+#: src/plugins/notification/notification_foldercheck.c:479
 msgid "Select folder(s)"
 msgstr ""
 
-#: src/plugins/notification/notification_foldercheck.c:579
+#: src/plugins/notification/notification_foldercheck.c:583
 msgid "select recursively"
 msgstr ""
 
@@ -10102,15 +10365,15 @@ msgid "No new messages"
 msgstr ""
 
 #: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:417
-#: src/plugins/notification/notification_prefs.c:400
-#: src/plugins/notification/notification_prefs.c:415
-#: src/plugins/notification/notification_prefs.c:434
-#: src/plugins/notification/notification_prefs.c:452
-#: src/plugins/notification/notification_prefs.c:470
-#: src/plugins/notification/notification_prefs.c:488
-#: src/plugins/notification/notification_prefs.c:506
-#: src/plugins/notification/notification_prefs.c:524
+#: src/plugins/notification/notification_plugin.c:420
+#: src/plugins/notification/notification_prefs.c:399
+#: src/plugins/notification/notification_prefs.c:414
+#: src/plugins/notification/notification_prefs.c:433
+#: src/plugins/notification/notification_prefs.c:451
+#: src/plugins/notification/notification_prefs.c:469
+#: src/plugins/notification/notification_prefs.c:487
+#: src/plugins/notification/notification_prefs.c:505
+#: src/plugins/notification/notification_prefs.c:523
 msgid "Notification"
 msgstr ""
 
@@ -10150,7 +10413,7 @@ msgstr ""
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:422
+#: src/plugins/notification/notification_plugin.c:425
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -10160,344 +10423,336 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:447
+#: src/plugins/notification/notification_plugin.c:450
 msgid "Various tools"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:314
+#: src/plugins/notification/notification_popup.c:311
 msgid "New Mail message"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:335
+#: src/plugins/notification/notification_popup.c:332
 msgid "New News post"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:336
+#: src/plugins/notification/notification_popup.c:333
 msgid "A new message arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:339
+#: src/plugins/notification/notification_popup.c:336
 msgid "New Calendar message"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:340
-#: src/plugins/notification/notification_trayicon.c:905
+#: src/plugins/notification/notification_popup.c:337
+#: src/plugins/notification/notification_trayicon.c:907
 msgid "A new calendar message arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:343
+#: src/plugins/notification/notification_popup.c:340
 msgid "New RSS feed article"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:344
-#: src/plugins/notification/notification_trayicon.c:908
+#: src/plugins/notification/notification_popup.c:341
+#: src/plugins/notification/notification_trayicon.c:910
 msgid "A new article in a RSS feed arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:347
+#: src/plugins/notification/notification_popup.c:344
 msgid "New unknown message"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:348
+#: src/plugins/notification/notification_popup.c:345
 msgid "Unknown message type arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:381
-#: src/plugins/notification/notification_trayicon.c:677
+#: src/plugins/notification/notification_popup.c:378
+#: src/plugins/notification/notification_trayicon.c:679
 msgid "Present main window"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:491
+#: src/plugins/notification/notification_popup.c:488
 msgid "Mail message"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:492
-#: src/plugins/notification/notification_popup.c:498
+#: src/plugins/notification/notification_popup.c:489
+#: src/plugins/notification/notification_popup.c:495
 #, c-format
 msgid "%d new message arrived"
 msgid_plural "%d new messages arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_popup.c:497
+#: src/plugins/notification/notification_popup.c:494
 msgid "News message"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:503
+#: src/plugins/notification/notification_popup.c:500
 msgid "Calendar message"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:504
-#: src/plugins/notification/notification_trayicon.c:942
+#: src/plugins/notification/notification_popup.c:501
+#: src/plugins/notification/notification_trayicon.c:944
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_popup.c:509
+#: src/plugins/notification/notification_popup.c:506
 msgid "RSS news feed"
 msgstr ""
 
-#: src/plugins/notification/notification_popup.c:510
+#: src/plugins/notification/notification_popup.c:507
 #, c-format
 msgid "%d new article in a RSS feed arrived"
 msgid_plural "%d new articles in a RSS feed arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_popup.c:574
+#: src/plugins/notification/notification_popup.c:571
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_prefs.c:416
+#: src/plugins/notification/notification_prefs.c:415
 msgid "Hotkeys"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:435
+#: src/plugins/notification/notification_prefs.c:434
 msgid "Banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:453
+#: src/plugins/notification/notification_prefs.c:452
 msgid "Popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:471 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:264
+#: src/prefs_receive.c:155
 msgid "Command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:489
+#: src/plugins/notification/notification_prefs.c:488
 msgid "LCD"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:507
+#: src/plugins/notification/notification_prefs.c:506
 msgid "SysTrayicon"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:525
+#: src/plugins/notification/notification_prefs.c:524
 msgid "Indicator"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:608
+#: src/plugins/notification/notification_prefs.c:607
 msgid "Include folder types"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:617
+#: src/plugins/notification/notification_prefs.c:616
 msgid "Mail folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:625
+#: src/plugins/notification/notification_prefs.c:624
 msgid "News folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:633
+#: src/plugins/notification/notification_prefs.c:632
 msgid "RSSyl folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:641
+#: src/plugins/notification/notification_prefs.c:640
 msgid "vCalendar folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:649
+#: src/plugins/notification/notification_prefs.c:648
 msgid "These settings override folder-specific selections."
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:660
+#: src/plugins/notification/notification_prefs.c:659
 msgid "Global notification settings"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:669
+#: src/plugins/notification/notification_prefs.c:668
 msgid "Set window manager urgency hint when new messages exist"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:678
+#: src/plugins/notification/notification_prefs.c:677
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:688
+#: src/plugins/notification/notification_prefs.c:687
 msgid "Use sound theme"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:762
+#: src/plugins/notification/notification_prefs.c:761
 msgid "Show banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:767
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:231 src/prefs_summaries.c:504
+#: src/plugins/notification/notification_prefs.c:766
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:769 src/prefs_receive.c:229
-#: src/prefs_summaries.c:486 src/prefs_summaries.c:505
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/prefs_summaries.c:461 src/prefs_summaries.c:558
 msgid "Always"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:771
+#: src/plugins/notification/notification_prefs.c:770
 msgid "Only when not empty"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:790
+#: src/plugins/notification/notification_prefs.c:789
 msgid "Banner speed"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:827
+#: src/plugins/notification/notification_prefs.c:826
 msgid "Maximum number of messages"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:833
+#: src/plugins/notification/notification_prefs.c:832
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:842
+#: src/plugins/notification/notification_prefs.c:841
 msgid "Banner width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:848
+#: src/plugins/notification/notification_prefs.c:847
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:850
+#: src/plugins/notification/notification_prefs.c:849
 msgid "pixel(s)"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:859
+#: src/plugins/notification/notification_prefs.c:858
 msgid "Include unread mails in banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:867
+#: src/plugins/notification/notification_prefs.c:866
 msgid "Make banner sticky"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:877
-#: src/plugins/notification/notification_prefs.c:1082
-#: src/plugins/notification/notification_prefs.c:1377
-#: src/plugins/notification/notification_prefs.c:1612
+#: src/plugins/notification/notification_prefs.c:876
+#: src/plugins/notification/notification_prefs.c:1081
+#: src/plugins/notification/notification_prefs.c:1376
+#: src/plugins/notification/notification_prefs.c:1611
 msgid "Only include selected folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:886
-#: src/plugins/notification/notification_prefs.c:1091
-#: src/plugins/notification/notification_prefs.c:1386
-#: src/plugins/notification/notification_prefs.c:1621
+#: src/plugins/notification/notification_prefs.c:885
+#: src/plugins/notification/notification_prefs.c:1090
+#: src/plugins/notification/notification_prefs.c:1385
+#: src/plugins/notification/notification_prefs.c:1620
 msgid "Select folders..."
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:898
+#: src/plugins/notification/notification_prefs.c:897
 msgid "Banner colors"
 msgstr "Banner colours"
 
-#: src/plugins/notification/notification_prefs.c:902
-#: src/plugins/notification/notification_prefs.c:1123
+#: src/plugins/notification/notification_prefs.c:901
+#: src/plugins/notification/notification_prefs.c:1122
 msgid "Use custom colors"
 msgstr "Use custom colours"
 
-#: src/plugins/notification/notification_prefs.c:917
-#: src/plugins/notification/notification_prefs.c:1136
+#: src/plugins/notification/notification_prefs.c:916
+#: src/plugins/notification/notification_prefs.c:1135
 msgid "Foreground"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:923
-#: src/plugins/notification/notification_prefs.c:1142
+#: src/plugins/notification/notification_prefs.c:922
+#: src/plugins/notification/notification_prefs.c:1141
 msgid "Foreground color"
 msgstr "Foreground colour"
 
-#: src/plugins/notification/notification_prefs.c:928
-#: src/plugins/notification/notification_prefs.c:1147
-#: src/prefs_msg_colors.c:281 src/prefs_msg_colors.c:302
-#: src/prefs_msg_colors.c:323
+#: src/plugins/notification/notification_prefs.c:927
+#: src/plugins/notification/notification_prefs.c:1146
+#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
+#: src/prefs_msg_colors.c:284
 msgid "Background"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:934
-#: src/plugins/notification/notification_prefs.c:1153
+#: src/plugins/notification/notification_prefs.c:933
+#: src/plugins/notification/notification_prefs.c:1152
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/plugins/notification/notification_prefs.c:1046
-#: src/plugins/notification/notification_prefs.c:1647
+#: src/plugins/notification/notification_prefs.c:1045
+#: src/plugins/notification/notification_prefs.c:1646
 msgid "Enable popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1063
-#: src/plugins/notification/notification_prefs.c:1665
+#: src/plugins/notification/notification_prefs.c:1062
+#: src/plugins/notification/notification_prefs.c:1664
 msgid "Popup timeout"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1073
-#: src/plugins/notification/notification_prefs.c:1368
-#: src/plugins/notification/notification_prefs.c:1674
-#: src/plugins/spamassassin/spamassassin_gtk.c:390 src/prefs_other.c:575
-#: src/prefs_receive.c:203 src/prefs_summaries.c:538
-msgid "seconds"
-msgstr ""
-
-#: src/plugins/notification/notification_prefs.c:1102
+#: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1112
+#: src/plugins/notification/notification_prefs.c:1111
 msgid "Set popup window width and position"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1117
+#: src/plugins/notification/notification_prefs.c:1116
 msgid "(the window manager is free to ignore this)"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1165
-#: src/plugins/notification/notification_prefs.c:1677
+#: src/plugins/notification/notification_prefs.c:1164
+#: src/plugins/notification/notification_prefs.c:1676
 msgid "Display folder name"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1230
+#: src/plugins/notification/notification_prefs.c:1229
 msgid "Sample popup window"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1236
+#: src/plugins/notification/notification_prefs.c:1235
 msgid "Done"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1294
+#: src/plugins/notification/notification_prefs.c:1293
 msgid "Select command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1323
+#: src/plugins/notification/notification_prefs.c:1322
 msgid "Enable command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1340
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1358
+#: src/plugins/notification/notification_prefs.c:1357
 msgid "Block command after execution for"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1465
+#: src/plugins/notification/notification_prefs.c:1464
 msgid "Enable LCD"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1484
+#: src/plugins/notification/notification_prefs.c:1483
 msgid "Hostname:Port of LCDd server"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1569
+#: src/plugins/notification/notification_prefs.c:1568
 msgid "Enable Trayicon"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1585
+#: src/plugins/notification/notification_prefs.c:1584
 msgid "Hide at start-up"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1593
+#: src/plugins/notification/notification_prefs.c:1592
 msgid "Close to tray"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1601
+#: src/plugins/notification/notification_prefs.c:1600
 msgid "Hide when iconified"
 msgstr ""
 
@@ -10507,40 +10762,36 @@ msgstr ""
 #. for that, go for something along the lines of "passive popup"
 #. instead.See also
 #. http://en.wikipedia.org/wiki/Toast_(computing)
-#: src/plugins/notification/notification_prefs.c:1638
+#: src/plugins/notification/notification_prefs.c:1637
 msgid "Passive toaster popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1865
+#: src/plugins/notification/notification_prefs.c:1801
 msgid "Add to Indicator Applet"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1879
+#: src/plugins/notification/notification_prefs.c:1815
 msgid "Hide mainwindow when minimized"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1885
-msgid "Register Claws Mail"
-msgstr ""
-
-#: src/plugins/notification/notification_prefs.c:1946
+#: src/plugins/notification/notification_prefs.c:1868
 msgid "Enable global hotkeys"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1960
+#: src/plugins/notification/notification_prefs.c:1882
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1960
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "<control><shift>F11"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1960
+#: src/plugins/notification/notification_prefs.c:1882
 msgid "<alt>N"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1971
+#: src/plugins/notification/notification_prefs.c:1893
 msgid "Toggle minimize"
 msgstr ""
 
@@ -10581,165 +10832,169 @@ msgstr ""
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:855
+#: src/plugins/notification/notification_trayicon.c:857
 msgid "New mail message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:859
 msgid "New news post"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:861
 msgid "New calendar message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:863
 msgid "New article in RSS feed"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:864
+#: src/plugins/notification/notification_trayicon.c:866
 msgid "New messages arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:920
+#: src/plugins/notification/notification_trayicon.c:922
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:931
+#: src/plugins/notification/notification_trayicon.c:933
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:953
+#: src/plugins/notification/notification_trayicon.c:955
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:702
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Title:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Author:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Creator:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Producer:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:710
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Created:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:714
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Modified:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:717
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
 msgid "Format:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
-#: src/plugins/pdf_viewer/poppler_viewer.c:722
+#: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:724
 msgid "Optimized:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1180
+#: src/plugins/pdf_viewer/poppler_viewer.c:1217
 msgid "PDF properties"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1326
+#: src/plugins/pdf_viewer/poppler_viewer.c:1366
 msgid "Enter password"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1327
+#: src/plugins/pdf_viewer/poppler_viewer.c:1367
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1342
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 #, c-format
 msgid "%s Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1348
+#: src/plugins/pdf_viewer/poppler_viewer.c:1388
 #, c-format
 msgid "of %d"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1364
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1728
-#: src/plugins/pdf_viewer/poppler_viewer.c:1945
+#: src/plugins/pdf_viewer/poppler_viewer.c:1776
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Index"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1913
+#: src/plugins/pdf_viewer/poppler_viewer.c:1958
 msgid "First Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1916
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "Previous Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1919
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Next Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1922
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Last Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1925
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Zoom In"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Zoom Out"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1930
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Fit Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1933
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page Width"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1936
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Rotate Left"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1939
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Right"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1942
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+msgid "Print Document"
+msgstr ""
+
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Document Info"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Page Number"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1949
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Zoom Factor"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2054
+#: src/plugins/pdf_viewer/poppler_viewer.c:2108
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -10748,13 +11003,13 @@ msgid ""
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2060
-#: src/plugins/pdf_viewer/poppler_viewer.c:2068
-#: src/plugins/pdf_viewer/poppler_viewer.c:2088
+#: src/plugins/pdf_viewer/poppler_viewer.c:2114
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2142
 msgid "PDF Viewer"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2118
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -10772,7 +11027,7 @@ msgstr ""
 msgid "Failed to register PGP address autocompletion hook"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:127
+#: src/plugins/pgpcore/passphrase.c:85 src/plugins/pgpcore/prefs_gpg.c:147
 msgid "Passphrase"
 msgstr ""
 
@@ -10810,7 +11065,7 @@ msgid ""
 "from a keyserver?"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:279
+#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
 msgid ""
 "\n"
 "  Key ID "
@@ -10843,26 +11098,26 @@ msgid ""
 "  Importing key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:268
+#: src/plugins/pgpcore/pgp_viewer.c:269
 msgid "   This key has been imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:270
+#: src/plugins/pgpcore/pgp_viewer.c:271
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:272
 msgid "   Key servers are sometimes slow.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:273
 msgid ""
 "   You can try to import it manually with the command:\n"
 "\n"
 "     "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:282
+#: src/plugins/pgpcore/pgp_viewer.c:289
 msgid "   This key is in your keyring.\n"
 msgstr ""
 
@@ -10887,148 +11142,153 @@ msgstr ""
 msgid "Core operations"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:142
 msgid "Automatically check signatures"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:125
+#: src/plugins/pgpcore/prefs_gpg.c:145
 msgid "Use keyring for address autocompletion"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:130
+#: src/plugins/pgpcore/prefs_gpg.c:150
 msgid "Use gpg-agent to manage passwords"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:135
+#: src/plugins/pgpcore/prefs_gpg.c:155
 msgid "Store passphrase in memory"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:145
+#: src/plugins/pgpcore/prefs_gpg.c:165
 msgid "Expire after"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:178
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:163 src/plugins/rssyl/rssyl_feed_props.c:476
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1874
-#: src/prefs_receive.c:187
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1779
+#: src/prefs_account.c:2076 src/prefs_receive.c:190
 msgid "minutes"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:173
+#: src/plugins/pgpcore/prefs_gpg.c:192
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:180
+#: src/plugins/pgpcore/prefs_gpg.c:199
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:183
+#: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:188
+#: src/plugins/pgpcore/prefs_gpg.c:207
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:229
+#: src/plugins/pgpcore/prefs_gpg.c:248
 msgid "Select GnuPG executable"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:356
+#: src/plugins/pgpcore/prefs_gpg.c:358
 msgid "Sign key"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:364
+#: src/plugins/pgpcore/prefs_gpg.c:366
 msgid "Use default GnuPG key"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:375
+#: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:386
+#: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:396
+#: src/plugins/pgpcore/prefs_gpg.c:398
 msgid "User or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:437
+#: src/plugins/pgpcore/prefs_gpg.c:442
 msgid "No secret key found."
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:440
+#: src/plugins/pgpcore/prefs_gpg.c:445
 msgid "Generate a new key pair"
 msgstr ""
 
-#: src/plugins/pgpcore/prefs_gpg.c:618
+#: src/plugins/pgpcore/prefs_gpg.c:688
 msgid "GPG"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:918
+msgid "S/MIME"
+msgstr ""
+
+#: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:101
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
 msgid "Undefined"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
 msgid "Marginal"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:246 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:170
 msgid "Ultimate"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:367
+#: src/plugins/pgpcore/select-keys.c:408
 msgid "Select Keys"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:394
+#: src/plugins/pgpcore/select-keys.c:457
 msgid "Key ID"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:397
+#: src/plugins/pgpcore/select-keys.c:475
 msgid "Trust"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:422
+#: src/plugins/pgpcore/select-keys.c:494
 msgid "_Other"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:423
+#: src/plugins/pgpcore/select-keys.c:495
 msgid "Do_n't encrypt"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:582
+#: src/plugins/pgpcore/select-keys.c:676
 msgid "Add key"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:583
+#: src/plugins/pgpcore/select-keys.c:677
 msgid "Enter another user or key ID:"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:605
+#: src/plugins/pgpcore/select-keys.c:699
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr ""
 
-#: src/plugins/pgpcore/select-keys.c:606
+#: src/plugins/pgpcore/select-keys.c:700
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
@@ -11040,228 +11300,228 @@ msgid ""
 "Do you trust this key enough to use it anyway?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Untrusted"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
 msgid "The signature has not been checked."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:252
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:270
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:273
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:283
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:305
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:291
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:295
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:298
+#: src/plugins/pgpcore/sgpgme.c:297
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:301
+#: src/plugins/pgpcore/sgpgme.c:300
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:310
+#: src/plugins/pgpcore/sgpgme.c:307
 msgid "The signature has not been checked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:329
+#: src/plugins/pgpcore/sgpgme.c:326
 msgid "Error checking signature: no status\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:347
+#: src/plugins/pgpcore/sgpgme.c:344
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:365
+#: src/plugins/pgpcore/sgpgme.c:362
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:368
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:376
+#: src/plugins/pgpcore/sgpgme.c:373
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:381
+#: src/plugins/pgpcore/sgpgme.c:378
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:386
+#: src/plugins/pgpcore/sgpgme.c:383
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:391
+#: src/plugins/pgpcore/sgpgme.c:388
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:404
+#: src/plugins/pgpcore/sgpgme.c:401
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:406
+#: src/plugins/pgpcore/sgpgme.c:403
 msgid "Revoked"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:411
+#: src/plugins/pgpcore/sgpgme.c:408
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:412
+#: src/plugins/pgpcore/sgpgme.c:409
 msgid "No key!"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:414
+#: src/plugins/pgpcore/sgpgme.c:411
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:432
+#: src/plugins/pgpcore/sgpgme.c:429
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:438
+#: src/plugins/pgpcore/sgpgme.c:435
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:472
+#: src/plugins/pgpcore/sgpgme.c:469
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:488
+#: src/plugins/pgpcore/sgpgme.c:485
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:643
+#: src/plugins/pgpcore/sgpgme.c:662
 msgid "Secret key specification is ambiguous"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:653
+#: src/plugins/pgpcore/sgpgme.c:672
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:666
+#: src/plugins/pgpcore/sgpgme.c:685
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:759
+#: src/plugins/pgpcore/sgpgme.c:778
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:765
+#: src/plugins/pgpcore/sgpgme.c:784
 #, 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:773
+#: src/plugins/pgpcore/sgpgme.c:792
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:789
+#: src/plugins/pgpcore/sgpgme.c:808
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:866
+#: src/plugins/pgpcore/sgpgme.c:885
 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:871
+#: src/plugins/pgpcore/sgpgme.c:890
 msgid "No PGP key found"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:872
+#: src/plugins/pgpcore/sgpgme.c:891
 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:961 src/plugins/pgpcore/sgpgme.c:983
+#: src/plugins/pgpcore/sgpgme.c:980 src/plugins/pgpcore/sgpgme.c:1002
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:971
+#: src/plugins/pgpcore/sgpgme.c:990
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:1008
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:993
+#: src/plugins/pgpcore/sgpgme.c:1012
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -11270,133 +11530,130 @@ msgid ""
 "Do you want to export it to a keyserver?"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:997
+#: src/plugins/pgpcore/sgpgme.c:1016
 msgid "Key generated"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1073
+#: src/plugins/pgpcore/sgpgme.c:1092
 msgid "Key exported."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:1075
+#: src/plugins/pgpcore/sgpgme.c:1094
 msgid "Couldn't export key."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:155
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:159
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:188
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
-#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
-#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:509 src/plugins/pgpmime/pgpmime.c:652
-#: src/plugins/smime/smime.c:413
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
+#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:655
+#: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:315
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
-#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
-#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
-#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:427
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:435
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
+#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
 msgid "Malformed message"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:503
-msgid "Couldn't create temporary file."
+#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
+#: src/plugins/pgpmime/pgpmime.c:695
+#, c-format
+msgid "Couldn't create temporary file, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:536
+#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, c-format
 msgid "Data signing failed, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:563
+#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:572
+#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
 msgid "Data signing failed, no results."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:583
+#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
 msgid "Data signing failed, no contents."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:623
+#: src/plugins/pgpinline/pgpinline.c:624
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:662
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:665
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:695 src/plugins/pgpmime/pgpmime.c:691
-#, c-format
-msgid "Couldn't create temporary file, %s"
-msgstr ""
-
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:718
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:723
 #, c-format
 msgid "Encryption failed, %s"
 msgstr ""
 
-#: src/plugins/pgpinline/pgpinline.c:795
+#: src/plugins/pgpinline/pgpinline.c:796
 msgid "PGP/Inline"
 msgstr ""
 
@@ -11419,34 +11676,34 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:203
+#: src/plugins/pgpmime/pgpmime.c:204
 msgid "Signature boundary not found."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
 msgid "Couldn't parse decrypted file."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
 msgid "Couldn't parse decrypted file parts."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:455 src/plugins/pgpmime/pgpmime.c:494
+#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:596
+#: src/plugins/pgpmime/pgpmime.c:599
 msgid "OpenPGP digital signature"
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:618
+#: src/plugins/pgpmime/pgpmime.c:621
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr ""
 
-#: src/plugins/pgpmime/pgpmime.c:790
+#: src/plugins/pgpmime/pgpmime.c:795
 msgid "PGP/Mime"
 msgstr ""
 
@@ -11468,36 +11725,36 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:359
+#: src/plugins/python/python_plugin.c:503
 msgid "Python scripts"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:497
+#: src/plugins/python/python_plugin.c:498
 msgid "Show Python console..."
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:483
+#: src/plugins/python/python_plugin.c:504
+#: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2524
-#: src/prefs_account.c:2546 src/prefs_account.c:2822 src/wizard.c:1205
-#: src/wizard.c:1625
+#: src/plugins/python/python_plugin.c:506 src/prefs_account.c:2727
+#: src/prefs_account.c:2755 src/prefs_account.c:3192 src/wizard.c:1206
+#: src/wizard.c:1626
 msgid "Browse"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:652
+#: src/plugins/python/python_plugin.c:736
 msgid "Python"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:657
+#: src/plugins/python/python_plugin.c:658
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:740
+#: src/plugins/python/python_plugin.c:741
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -11544,7 +11801,7 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:791
+#: src/plugins/python/python_plugin.c:792
 msgid "Python integration"
 msgstr ""
 
@@ -11555,22 +11812,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:110
+#: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:131
+#: src/plugins/rssyl/opml_export.c:132
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:141
+#: src/plugins/rssyl/opml_export.c:142
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr ""
 
-#: src/plugins/rssyl/opml_export.c:182
+#: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr ""
 
@@ -11596,12 +11853,12 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_add_item.c:296
+#: src/plugins/rssyl/rssyl_add_item.c:297
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl.c:155 src/plugins/rssyl/rssyl.c:166
+#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
 msgid "Refresh all feeds"
 msgstr ""
 
@@ -11618,30 +11875,26 @@ msgstr ""
 msgid "'%c' can't be used in folder name."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/rssyl/rssyl_cb_menu.c:246 src/plugins/rssyl/rssyl_cb_menu.c:293
+#: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:319
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:320
 msgid "Remove feed tree"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:354
 msgid "Select an OPML file"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed.c:75 src/plugins/rssyl/rssyl_subscribe.c:158
-#, c-format
-msgid "Couldn't create folder for new feed '%s'."
-msgstr ""
-
 #: src/plugins/rssyl/rssyl_feed.h:10
 #, c-format
 msgid "RSSyl: Subscribing new feed: %s\n"
@@ -11686,100 +11939,100 @@ msgstr ""
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:291
+#: src/plugins/rssyl/rssyl_feed_props.c:292
 msgid "Use default refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:303
+#: src/plugins/rssyl/rssyl_feed_props.c:304
 msgid "Keep old items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "_Trim"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:311
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 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:315
 msgid "Fetch comments if possible"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:339
+#: src/plugins/rssyl/rssyl_feed_props.c:335
 msgid "Always mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:345
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 msgid "Only mark it as new if its text has changed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:351
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Never mark it as new"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:356
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid "Add item title to the top of message"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:363
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid "Ignore title rename"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:368
+#: src/plugins/rssyl/rssyl_feed_props.c:356
 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:372
-#: src/plugins/vcalendar/vcal_prefs.c:550
-msgid "Verify SSL certificate validity"
+#: src/plugins/rssyl/rssyl_feed_props.c:360
+#: src/plugins/vcalendar/vcal_prefs.c:593
+msgid "Verify SSL/TLS certificate validity"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:392
+#: src/plugins/rssyl/rssyl_feed_props.c:380
 msgid "User name"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:405
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 msgid "Source URL"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:418
+#: src/plugins/rssyl/rssyl_feed_props.c:406
 msgid "Fetch comments on posts aged less than"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:426
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1480 src/prefs_folder_item.c:553 src/prefs_matcher.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1605 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:427
+#: src/plugins/rssyl/rssyl_feed_props.c:415
 msgid "Set to -1 to fetch all comments"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:451
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "If an item changes"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:456
+#: src/plugins/rssyl/rssyl_feed_props.c:444
 msgid "Items"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:469
+#: src/plugins/rssyl/rssyl_feed_props.c:457
 msgid "Refresh interval"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:477
+#: src/plugins/rssyl/rssyl_feed_props.c:465
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:529
+#: src/plugins/rssyl/rssyl_feed_props.c:517
 msgid "_OK"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_feed_props.c:537
+#: src/plugins/rssyl/rssyl_feed_props.c:525
 msgid "Set feed properties"
 msgstr ""
 
@@ -11847,7 +12100,7 @@ msgid "Refresh all feeds on application start"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_prefs.c:170
-msgid "Verify SSL certificates validity for new feeds"
+msgid "Verify SSL/TLS certificates validity for new feeds"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_prefs.c:177
@@ -11866,6 +12119,11 @@ msgstr ""
 msgid "Security and privacy"
 msgstr ""
 
+#: src/plugins/rssyl/rssyl_subscribe.c:158
+#, c-format
+msgid "Couldn't create folder for new feed '%s'."
+msgstr ""
+
 #: src/plugins/rssyl/rssyl_subscribe_gtk.c:47
 msgid "Subscribe new feed?"
 msgstr ""
@@ -11884,32 +12142,32 @@ msgstr ""
 msgid "_Edit feed properties after subscribing"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_comments.c:105
+#: src/plugins/rssyl/rssyl_update_comments.c:107
 #, c-format
 msgid "Updating comments for '%s'..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1614
+#: src/plugins/rssyl/rssyl_update_feed.c:107
+#: src/plugins/vcalendar/vcal_folder.c:1621
 msgid "401 (Authorisation required)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1617
+#: src/plugins/rssyl/rssyl_update_feed.c:110
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "403 (Unauthorised)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/rssyl/rssyl_update_feed.c:113
+#: src/plugins/vcalendar/vcal_folder.c:1627
 msgid "404 (Not found)"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:114
+#: src/plugins/rssyl/rssyl_update_feed.c:116
 #, c-format
 msgid "Error %d"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:127
+#: src/plugins/rssyl/rssyl_update_feed.c:129
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -11919,28 +12177,28 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:140
+#: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
 msgid ""
 "No valid feed found at\n"
 "<b>%s</b>"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:152
+#: src/plugins/rssyl/rssyl_update_feed.c:154
 msgid "Untitled feed"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:156
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:233
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:268
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -11949,21 +12207,16 @@ msgid ""
 "Please contact developers, this should not happen."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:352
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_update_format.c:127
+#: src/plugins/rssyl/rssyl_update_format.c:128
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
 msgstr ""
 
-#: src/plugins/smime/plugin.c:38 src/plugins/smime/plugin.c:54
-#: src/plugins/smime/smime.c:913
-msgid "S/MIME"
-msgstr ""
-
 #: src/plugins/smime/plugin.c:59
 msgid ""
 "This plugin handles S/MIME signed and/or encrypted mails. You can decrypt "
@@ -11984,44 +12237,44 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>"
 msgstr ""
 
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:426
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr ""
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:454
 msgid "Couldn't open temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
 msgid "Couldn't write to temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:491
 msgid "Couldn't close temporary file"
 msgstr ""
 
-#: src/plugins/smime/smime.c:708
+#: src/plugins/smime/smime.c:713
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:299
+#: src/plugins/spam_report/spam_report.c:302
 msgid "Reporting spam..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:334
+#: src/plugins/spam_report/spam_report.c:337
 msgid "Report spam online..."
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:345
-#: src/plugins/spam_report/spam_report.c:383
+#: src/plugins/spam_report/spam_report.c:348
+#: src/plugins/spam_report/spam_report.c:386
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:388
+#: src/plugins/spam_report/spam_report.c:391
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12031,7 +12284,7 @@ msgid ""
 " * lists.debian.org nomination system"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report.c:413
+#: src/plugins/spam_report/spam_report.c:416
 msgid "Spam reporting"
 msgstr ""
 
@@ -12043,53 +12296,53 @@ msgstr ""
 msgid "Forward to:"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1573
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
 msgid "Password:"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
+#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin_gtk.c:671
 msgid "SpamAssassin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:169
+#: src/plugins/spamassassin/spamassassin.c:182
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:185
+#: src/plugins/spamassassin/spamassassin.c:198
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:238
+#: src/plugins/spamassassin/spamassassin.c:224
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:243
+#: src/plugins/spamassassin/spamassassin.c:229
 msgid "SpamAssassin: filtering message..."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:372
+#: src/plugins/spamassassin/spamassassin.c:358
 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:429
+#: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:574
+#: src/plugins/spamassassin/spamassassin.c:561
 msgid "Failed to get username"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:586
+#: src/plugins/spamassassin/spamassassin.c:578
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin.c:620
+#: src/plugins/spamassassin/spamassassin.c:612
 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 "
@@ -12103,61 +12356,73 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
 msgid "TCP"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Unix Socket"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:268
+#: src/plugins/spamassassin/spamassassin_gtk.c:122
+msgid "Select folder to save spam to"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
 msgid "Enable SpamAssassin plugin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:272
+#: src/plugins/spamassassin/spamassassin_gtk.c:278
 msgid "Transport"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:280
+#: src/plugins/spamassassin/spamassassin_gtk.c:286
 msgid "Type of transport"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:301
+#: src/plugins/spamassassin/spamassassin_gtk.c:307
 msgid "User"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:320
 msgid "User to use with spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:316
+#: src/plugins/spamassassin/spamassassin_gtk.c:322
 msgid "spamd"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:334
+#: src/plugins/spamassassin/spamassassin_gtk.c:340
 msgid "Hostname or IP address of spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Port of spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Path of Unix socket"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:386
+#: src/plugins/spamassassin/spamassassin_gtk.c:364
+msgid "Use compression"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:368
+msgid "Enable compression if spamd uses it, otherwise disable it."
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:403
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:65
+#: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
 msgid ""
 "\n"
@@ -12166,29 +12431,29 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:122
-#: src/plugins/tnef_parse/tnef_parse.c:129
+#: src/plugins/tnef_parse/tnef_parse.c:131
+#: src/plugins/tnef_parse/tnef_parse.c:138
 msgid "Failed to write the part data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:174
+#: src/plugins/tnef_parse/tnef_parse.c:183
 msgid "Failed to parse VCalendar data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:213
+#: src/plugins/tnef_parse/tnef_parse.c:222
 msgid "Failed to parse VTask data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:263
+#: src/plugins/tnef_parse/tnef_parse.c:274
 msgid "Failed to parse VCard data."
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:399
-#: src/plugins/tnef_parse/tnef_parse.c:423
+#: src/plugins/tnef_parse/tnef_parse.c:414
+#: src/plugins/tnef_parse/tnef_parse.c:438
 msgid "TNEF Parser"
 msgstr ""
 
-#: src/plugins/tnef_parse/tnef_parse.c:428
+#: src/plugins/tnef_parse/tnef_parse.c:443
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -12212,11 +12477,11 @@ msgstr ""
 msgid "_Go to today"
 msgstr ""
 
-#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
 msgid "Start"
 msgstr ""
 
-#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
 msgid "Show"
 msgstr ""
 
@@ -12296,23 +12561,18 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:796
+#: src/plugins/vcalendar/month-view.c:798
 msgid "Week number"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:887
+#: src/plugins/vcalendar/month-view.c:889
 msgid "Previous month"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:907
+#: src/plugins/vcalendar/month-view.c:909
 msgid "Next month"
 msgstr ""
 
-#: src/plugins/vcalendar/plugin.c:44 src/plugins/vcalendar/plugin.c:68
-#: src/plugins/vcalendar/vcal_prefs.c:729
-msgid "vCalendar"
-msgstr ""
-
 #: src/plugins/vcalendar/plugin.c:73
 msgid ""
 "This plugin enables vCalendar message handling like that produced by "
@@ -12325,7 +12585,7 @@ msgid ""
 "To create a meeting right-click on the vCalendar or Meetings folder and "
 "choose \"New meeting...\".\n"
 "\n"
-"You will also be able to subscribe to remote webCal feeds,export your "
+"You will also be able to subscribe to remote Webcal feeds, export your "
 "meetings and calendars, publish your free/busy information and retrieve that "
 "information from others."
 msgstr ""
@@ -12344,244 +12604,244 @@ msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:139
+#: src/plugins/vcalendar/vcalendar.c:140
 msgid "Creating meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:158
+#: src/plugins/vcalendar/vcalendar.c:159
 msgid "no subject"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:393
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Accept"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:394
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Tentatively accept"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:395
+#: src/plugins/vcalendar/vcalendar.c:387
 msgid "Decline"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:474
 msgid "You have a Todo item."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:483 src/plugins/vcalendar/vcalendar.c:490
-#: src/plugins/vcalendar/vcalendar.c:495 src/plugins/vcalendar/vcalendar.c:503
-#: src/plugins/vcalendar/vcalendar.c:512 src/plugins/vcalendar/vcalendar.c:753
+#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:730
 msgid "Details follow:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:489
+#: src/plugins/vcalendar/vcalendar.c:481
 msgid "You have created a meeting."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:486
 msgid "You have been invited to a meeting."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:494
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:511
+#: src/plugins/vcalendar/vcalendar.c:503
 msgid "You have been forwarded an appointment."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:565
+#: src/plugins/vcalendar/vcalendar.c:557
 msgid "(this event recurs)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:572
+#: src/plugins/vcalendar/vcalendar.c:564
 msgid "(this event is part of a recurring event)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:752
+#: src/plugins/vcalendar/vcalendar.c:729
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:756
+#: src/plugins/vcalendar/vcalendar.c:733
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:835
+#: src/plugins/vcalendar/vcalendar.c:812
 msgid "Error - could not get the calendar MIME part."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:842
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - no calendar part found."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:856
+#: src/plugins/vcalendar/vcalendar.c:833
 msgid "Error - Unknown calendar component type."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:965
 msgid "Send a notification to the attendees"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:994
+#: src/plugins/vcalendar/vcalendar.c:974
 msgid "Cancel meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:995
+#: src/plugins/vcalendar/vcalendar.c:975
 msgid "Are you sure you want to cancel this meeting?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1090
+#: src/plugins/vcalendar/vcalendar.c:1070
 msgid "No account found"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1091
+#: src/plugins/vcalendar/vcalendar.c:1071
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1093
+#: src/plugins/vcalendar/vcalendar.c:1073
 msgid "Reply anyway"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1222
+#: src/plugins/vcalendar/vcalendar.c:1202
 msgid "Answer"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1223
+#: src/plugins/vcalendar/vcalendar.c:1203
 msgid "Edit meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1224
+#: src/plugins/vcalendar/vcalendar.c:1204
 msgid "Cancel meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1225
+#: src/plugins/vcalendar/vcalendar.c:1205
 msgid "Launch website"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1229
+#: src/plugins/vcalendar/vcalendar.c:1209
 msgid "You are already busy at this time."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1268
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1740
+#: src/plugins/vcalendar/vcalendar.c:1248
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1269
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1729
+#: src/plugins/vcalendar/vcalendar.c:1249
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: src/plugins/vcalendar/vcalendar.c:1270
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1721
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcalendar.c:1250
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1271
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1730
+#: src/plugins/vcalendar/vcalendar.c:1251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1272
+#: src/plugins/vcalendar/vcalendar.c:1252
 msgid "Starting:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1273
+#: src/plugins/vcalendar/vcalendar.c:1253
 msgid "Ending:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1275
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1723
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1733
+#: src/plugins/vcalendar/vcalendar.c:1255
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1277
+#: src/plugins/vcalendar/vcalendar.c:1257
 msgid "Action:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:165
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_New meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Export calendar..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:167
-msgid "_Subscribe to webCal..."
+#: src/plugins/vcalendar/vcal_folder.c:170
+msgid "_Subscribe to Webcal..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:169
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:175
 msgid "_Week view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:176
 msgid "_Month view"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1095
+#: src/plugins/vcalendar/vcal_folder.c:1103
 msgid "Meetings"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1494
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "in the past"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1497
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "today"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "tomorrow"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "this week"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1514
 msgid "later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1510
+#: src/plugins/vcalendar/vcal_folder.c:1518
 #, c-format
 msgid ""
 "\n"
 "These are the events planned %s:\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1605
+#: src/plugins/vcalendar/vcal_folder.c:1612
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1623
+#: src/plugins/vcalendar/vcal_folder.c:1630
 #, c-format
 msgid "Error %ld"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1820
+#: src/plugins/vcalendar/vcal_folder.c:1812
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -12590,212 +12850,199 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1824
-#, c-format
-msgid ""
-"Could not retrieve the Webcal URL:\n"
-"%s:\n"
-"\n"
-"%s\n"
-msgstr ""
-
-#: src/plugins/vcalendar/vcal_folder.c:1835
+#: src/plugins/vcalendar/vcal_folder.c:1843
 #, c-format
 msgid ""
-"This URL does not look like a WebCal URL:\n"
+"This URL does not look like a Webcal URL:\n"
 "%s\n"
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1838
-#, c-format
-msgid ""
-"This URL does not look like a WebCal URL:\n"
-"%s\n"
-"%s\n"
-msgstr ""
-
-#: src/plugins/vcalendar/vcal_folder.c:1867
-#: src/plugins/vcalendar/vcal_folder.c:1870
+#: src/plugins/vcalendar/vcal_folder.c:1874
+#: src/plugins/vcalendar/vcal_folder.c:1877
 #, c-format
 msgid "Could not create directory %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1908
+#: src/plugins/vcalendar/vcal_folder.c:1917
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1919
+#: src/plugins/vcalendar/vcal_folder.c:1928
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1920
+#: src/plugins/vcalendar/vcal_folder.c:1929
 msgid "new subscription"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1931
+#: src/plugins/vcalendar/vcal_folder.c:1940
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
-msgid "Subscribe to WebCal"
+#: src/plugins/vcalendar/vcal_folder.c:1952
+msgid "Subscribe to Webcal"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1943
-msgid "Enter the WebCal URL:"
+#: src/plugins/vcalendar/vcal_folder.c:1952
+msgid "Enter the Webcal URL:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1955
+#: src/plugins/vcalendar/vcal_folder.c:1964
 msgid "Could not parse the URL."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_folder.c:1983
+#: src/plugins/vcalendar/vcal_folder.c:1992
 msgid "Do you really want to unsubscribe?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:109
+#: src/plugins/vcalendar/vcal_folder.c:1993
+msgid "Delete subscription"
+msgstr ""
+
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "tentatively accepted"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "declined"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:114
 msgid "did not answer"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:142
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "individual"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:143
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "group"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "resource"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "room"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:556
+#: src/plugins/vcalendar/vcal_manager.c:560
 msgid "Past"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:559
+#: src/plugins/vcalendar/vcal_manager.c:563
 msgid "Today"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:562
+#: src/plugins/vcalendar/vcal_manager.c:566
 msgid "Tomorrow"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:565
+#: src/plugins/vcalendar/vcal_manager.c:569
 msgid "This week"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:568
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1256
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Accepted: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1258
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Declined: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_manager.c:1260
+#: src/plugins/vcalendar/vcal_manager.c:1252
 msgid "Tentatively Accepted: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Individual"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Resource"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
 msgid "Room"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
 msgid "Add..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
 msgid "You"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
 msgid "You are busy at the time of your planned meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
 #, c-format
 msgid "%d hour sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
 #, c-format
 msgid "%d hours sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 #, c-format
 msgid "%d minutes sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
 #, c-format
 msgid "%d hour later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
 #, c-format
 msgid "%d hours later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
 #, c-format
 msgid "%d minutes later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid ""
 "\n"
@@ -12803,7 +13050,7 @@ msgid ""
 "Everyone would be available %s or %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid ""
 "\n"
@@ -12811,7 +13058,7 @@ msgid ""
 "Everyone would be available %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 msgid ""
 "\n"
 "\n"
@@ -12819,139 +13066,139 @@ msgid ""
 "6 hours."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
 #, c-format
 msgid "would be available %s or %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
 #, c-format
 msgid "would be available %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
 msgid "not available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
 #, c-format
 msgid ", but would be available %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 msgid "Free/busy retrieval failed"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
 msgid "Not everyone is available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
 msgid "Send anyway"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
 msgid "Available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
 msgid "Everyone is available."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1353
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1474
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
 msgid "Save & Send"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1475
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
 msgid "Check availability"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1598
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
 msgid "Starts at:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1628
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:767
 msgid "on:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1622
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
 msgid "Ends at:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1663
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
 msgid "New meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1665
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
 #, c-format
 msgid "%s - Edit meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1744
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Time:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1877
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1880
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1891
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "Upcoming event: %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1892
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -12962,763 +13209,829 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1909
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2035
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
 msgid "Empty calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2036
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
 msgid "There is nothing to export."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2076
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
 msgid "Could not export the calendar."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2093
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
 msgid "Export calendar to ICS"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2232
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
 msgid "Could not export the freebusy info."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2264
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:285
+#: src/plugins/vcalendar/vcal_prefs.c:300
 msgid "Reminders"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:294
+#: src/plugins/vcalendar/vcal_prefs.c:309
 msgid "Alert me"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:306
+#: src/plugins/vcalendar/vcal_prefs.c:338
 msgid "minutes before an event"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:318
+#: src/plugins/vcalendar/vcal_prefs.c:361
 msgid "Calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:329
+#: src/plugins/vcalendar/vcal_prefs.c:372
 msgid "Automatically export calendar to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:338
-#: src/plugins/vcalendar/vcal_prefs.c:457
+#: src/plugins/vcalendar/vcal_prefs.c:381
+#: src/plugins/vcalendar/vcal_prefs.c:500
 msgid "You can export to a local file or URL"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:340
+#: src/plugins/vcalendar/vcal_prefs.c:383
 msgid "Specify a local file or URL (http://server/path/file.ics)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:370
-msgid "Include webcal subscriptions in export"
+#: src/plugins/vcalendar/vcal_prefs.c:413
+msgid "Include Webcal subscriptions in export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:380
+#: src/plugins/vcalendar/vcal_prefs.c:423
 msgid "Command to run after calendar export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:409
+#: src/plugins/vcalendar/vcal_prefs.c:452
 msgid "Register Claws' calendar in XFCE's Orage clock"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:411
+#: src/plugins/vcalendar/vcal_prefs.c:454
 msgid "Allows Orage (version greater than 4.4) to see Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:424
+#: src/plugins/vcalendar/vcal_prefs.c:467
 msgid "Export as GNOME shell calendar server"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:426
+#: src/plugins/vcalendar/vcal_prefs.c:469
 msgid ""
 "Register D-Bus calendar server interface to export Claws Mail's calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:436
+#: src/plugins/vcalendar/vcal_prefs.c:479
 msgid "Free/Busy information"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:448
+#: src/plugins/vcalendar/vcal_prefs.c:491
 msgid "Automatically export free/busy status to"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:459
+#: src/plugins/vcalendar/vcal_prefs.c:502
 msgid "Specify a local file or URL (http://server/path/file.ifb)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:489
+#: src/plugins/vcalendar/vcal_prefs.c:532
 msgid "Command to run after free/busy status export"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:516
+#: src/plugins/vcalendar/vcal_prefs.c:559
 msgid "Get free/busy status of others from"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:524
+#: src/plugins/vcalendar/vcal_prefs.c:567
 #, c-format
 msgid ""
 "Specify a local file or URL (http://server/path/file.ifb). Use %u for the "
 "left part of the email address, %d for the domain"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_prefs.c:538
-msgid "SSL options"
+#: src/plugins/vcalendar/vcal_prefs.c:581
+msgid "SSL/TLS options"
 msgstr ""
 
-#: src/pop.c:152
+#: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr ""
 
-#: src/pop.c:159
+#: src/pop.c:160
 msgid "Timestamp syntax error in greeting\n"
 msgstr ""
 
-#: src/pop.c:166
+#: src/pop.c:167
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr ""
 
-#: src/pop.c:190 src/pop.c:217
-msgid "POP3 protocol error\n"
+#: src/pop.c:191 src/pop.c:218
+msgid "POP protocol error\n"
 msgstr ""
 
-#: src/pop.c:263
+#: src/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr ""
 
-#: src/pop.c:841
+#: src/pop.c:842
 #, c-format
-msgid "POP3: Deleting expired message %d [%s]\n"
+msgid "POP: Deleting expired message %d [%s]\n"
 msgstr ""
 
-#: src/pop.c:857
+#: src/pop.c:858
 #, c-format
-msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
+msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr ""
 
-#: src/pop.c:889
+#: src/pop.c:890
 msgid "mailbox is locked\n"
 msgstr ""
 
-#: src/pop.c:892
+#: src/pop.c:893
 msgid "Session timeout\n"
 msgstr ""
 
-#: src/pop.c:911
+#: src/pop.c:912
 msgid "command not supported\n"
 msgstr ""
 
-#: src/pop.c:916
-msgid "error occurred on POP3 session\n"
+#: src/pop.c:917
+msgid "error occurred on POP session\n"
 msgstr ""
 
-#: src/pop.c:1111
+#: src/pop.c:1112
 msgid "TOP command unsupported\n"
 msgstr ""
 
-#: src/prefs_account.c:334 src/prefs_account.c:1454 src/prefs_account.c:2452
-#: src/wizard.c:1499
-msgid "POP3"
+#: src/prefs_account.c:364 src/prefs_account.c:1579 src/prefs_account.c:2655
+msgid "POP"
 msgstr ""
 
-#: src/prefs_account.c:335 src/prefs_account.c:1567 src/prefs_account.c:2467
-msgid "IMAP4"
+#: src/prefs_account.c:365 src/prefs_account.c:1692 src/prefs_account.c:2670
+#: src/wizard.c:1501
+msgid "IMAP"
 msgstr ""
 
-#: src/prefs_account.c:336
+#: src/prefs_account.c:366
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:337 src/wizard.c:1501
+#: src/prefs_account.c:367 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr ""
 
-#: src/prefs_account.c:338
+#: src/prefs_account.c:368
 msgid "None (SMTP only)"
 msgstr ""
 
-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1128
 msgid "Name of account"
 msgstr ""
 
-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1137
 msgid "Set as default"
 msgstr ""
 
-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1145
 msgid "Personal information"
 msgstr ""
 
-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1154
 msgid "Full name"
 msgstr ""
 
-#: src/prefs_account.c:1060
+#: src/prefs_account.c:1160
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1123 src/wizard.c:1524
+#: src/prefs_account.c:1223 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1125 src/wizard.c:1525
+#: src/prefs_account.c:1225 src/wizard.c:1526
 msgid "Cancel"
 msgstr ""
 
-#: src/prefs_account.c:1142
+#: src/prefs_account.c:1242
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
 msgstr ""
 
-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1273
 msgid "This server requires authentication"
 msgstr ""
 
-#: src/prefs_account.c:1178
+#: src/prefs_account.c:1280
 msgid "Authenticate on connect"
 msgstr ""
 
-#: src/prefs_account.c:1232
+#: src/prefs_account.c:1342
 msgid "News server"
 msgstr ""
 
-#: src/prefs_account.c:1238
+#: src/prefs_account.c:1348
 msgid "Server for receiving"
 msgstr ""
 
-#: src/prefs_account.c:1244
+#: src/prefs_account.c:1354
 msgid "Local mailbox"
 msgstr ""
 
-#: src/prefs_account.c:1251
+#: src/prefs_account.c:1361
 msgid "SMTP server (send)"
 msgstr ""
 
-#: src/prefs_account.c:1259
+#: src/prefs_account.c:1369
 msgid "Use mail command rather than SMTP server"
 msgstr ""
 
-#: src/prefs_account.c:1268
+#: src/prefs_account.c:1378
 msgid "command to send mails"
 msgstr ""
 
-#: src/prefs_account.c:1332
+#: src/prefs_account.c:1453
 #, c-format
 msgid "Account%d"
 msgstr ""
 
-#: src/prefs_account.c:1428
+#: src/prefs_account.c:1553
 msgid "Local"
 msgstr ""
 
-#: src/prefs_account.c:1434 src/prefs_account.c:1523
+#: src/prefs_account.c:1559 src/prefs_account.c:1648
 msgid "Default Inbox"
 msgstr ""
 
-#: src/prefs_account.c:1441 src/prefs_account.c:1448 src/prefs_account.c:1530
-#: src/prefs_account.c:1537
+#: src/prefs_account.c:1566 src/prefs_account.c:1573 src/prefs_account.c:1655
+#: src/prefs_account.c:1662
 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1581
 msgid "Use secure authentication (APOP)"
 msgstr ""
 
-#: src/prefs_account.c:1459
+#: src/prefs_account.c:1584
 msgid "Remove messages on server when received"
 msgstr ""
 
-#: src/prefs_account.c:1470
+#: src/prefs_account.c:1595
 msgid "Remove after"
 msgstr ""
 
-#: src/prefs_account.c:1477 src/prefs_account.c:1487
+#: src/prefs_account.c:1602 src/prefs_account.c:1612
 msgid "0 days and 0 hours : remove immediately"
 msgstr ""
 
-#: src/prefs_account.c:1500
+#: src/prefs_account.c:1625
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1628
 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:1543 src/prefs_account.c:2482
+#: src/prefs_account.c:1668 src/prefs_account.c:2685
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account.c:1550
+#: src/prefs_account.c:1675
 msgid "Maximum number of articles to download"
 msgstr ""
 
-#: src/prefs_account.c:1560
+#: src/prefs_account.c:1685
 msgid "unlimited if 0 is specified"
 msgstr ""
 
-#: src/prefs_account.c:1585
+#: src/prefs_account.c:1710
 msgid "Plain text"
 msgstr ""
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1723
 msgid "IMAP server directory"
 msgstr ""
 
-#: src/prefs_account.c:1602
+#: src/prefs_account.c:1727
 msgid "(usually empty)"
 msgstr ""
 
-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1741
 msgid "Show subscribed folders only"
 msgstr ""
 
-#: src/prefs_account.c:1623
+#: src/prefs_account.c:1748
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1625
+#: src/prefs_account.c:1750
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1632
+#: src/prefs_account.c:1757 src/prefs_receive.c:164
+msgid "Automatic checking"
+msgstr ""
+
+#: src/prefs_account.c:1760
+msgid "Use global settings"
+msgstr ""
+
+#: src/prefs_account.c:1766 src/prefs_receive.c:171
+msgid "Check for new mail every"
+msgstr ""
+
+#: src/prefs_account.c:1805
 msgid "Filter messages on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1639
+#: src/prefs_account.c:1821
 msgid "Allow filtering using plugins on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1643
+#: src/prefs_account.c:1825
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1725 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1967 src/prefs_matcher.c:1989
+#: src/prefs_account.c:1914 src/prefs_customheader.c:209
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2010 src/prefs_matcher.c:2038
 msgid "Header"
 msgstr ""
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1916
 msgid "Generate Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1919
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1733
+#: src/prefs_account.c:1922
 msgid "Add user agent header"
 msgstr ""
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1929
 msgid "Add user-defined header"
 msgstr ""
 
-#: src/prefs_account.c:1755
+#: src/prefs_account.c:1944
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:1840
+#: src/prefs_account.c:2042
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account.c:1851
-msgid "Authenticate with POP3 before sending"
+#: src/prefs_account.c:2053
+msgid "Authenticate with POP before sending"
 msgstr ""
 
-#: src/prefs_account.c:1866
-msgid "POP authentication timeout: "
+#: src/prefs_account.c:2068
+msgid "POP authentication timeout"
 msgstr ""
 
-#: src/prefs_account.c:1954 src/prefs_account.c:2000
+#: src/prefs_account.c:2156 src/prefs_account.c:2202
 msgid "Signature"
 msgstr ""
 
-#: src/prefs_account.c:1957
+#: src/prefs_account.c:2159
 msgid "Automatically insert signature"
 msgstr ""
 
-#: src/prefs_account.c:1962
+#: src/prefs_account.c:2164
 msgid "Signature separator"
 msgstr ""
 
-#: src/prefs_account.c:1987
+#: src/prefs_account.c:2189
 msgid "Command output"
 msgstr ""
 
-#: src/prefs_account.c:2020
+#: src/prefs_account.c:2222
 msgid "Automatically set the following addresses"
 msgstr ""
 
-#: src/prefs_account.c:2072
+#: src/prefs_account.c:2274
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2082 src/prefs_folder_item.c:1080
-#: src/prefs_spelling.c:163
+#: src/prefs_account.c:2284 src/prefs_folder_item.c:1114
+#: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2095 src/prefs_folder_item.c:1114
-#: src/prefs_spelling.c:176
+#: src/prefs_account.c:2297 src/prefs_folder_item.c:1148
+#: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2181 src/prefs_account.c:3341
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1430
-#: src/prefs_folder_item.c:1820 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:336 src/prefs_wrapping.c:153
+#: src/prefs_account.c:2383 src/prefs_account.c:3796
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
+#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr ""
 
-#: src/prefs_account.c:2196 src/prefs_folder_item.c:1458 src/prefs_quote.c:134
-#: src/toolbar.c:409
+#: src/prefs_account.c:2398 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/toolbar.c:490
 msgid "Reply"
 msgstr ""
 
-#: src/prefs_account.c:2211 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1486 src/prefs_quote.c:149 src/toolbar.c:413
+#: src/prefs_account.c:2413 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr ""
 
-#: src/prefs_account.c:2258
+#: src/prefs_account.c:2460
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2287
+#: src/prefs_account.c:2489 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2289
+#: src/prefs_account.c:2491 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr ""
 
-#: src/prefs_account.c:2291
+#: src/prefs_account.c:2493
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 
-#: src/prefs_account.c:2294
+#: src/prefs_account.c:2496
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
-#: src/prefs_account.c:2297
+#: src/prefs_account.c:2499
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
-#: src/prefs_account.c:2299
+#: src/prefs_account.c:2501
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
-#: src/prefs_account.c:2456 src/prefs_account.c:2471 src/prefs_account.c:2485
-msgid "Don't use SSL"
+#: src/prefs_account.c:2659 src/prefs_account.c:2674 src/prefs_account.c:2688
+msgid "Don't use SSL/TLS"
+msgstr ""
+
+#: src/prefs_account.c:2662 src/prefs_account.c:2677 src/prefs_account.c:2697
+#: src/prefs_account.c:2708
+msgid "Use SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2459
-msgid "Use SSL for POP3 connection"
+#: src/prefs_account.c:2665 src/prefs_account.c:2680 src/prefs_account.c:2711
+msgid "Use STARTTLS command to start encrypted session"
 msgstr ""
 
-#: src/prefs_account.c:2462 src/prefs_account.c:2477 src/prefs_account.c:2508
-msgid "Use STARTTLS command to start SSL session"
+#: src/prefs_account.c:2701
+msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account.c:2474
-msgid "Use SSL for IMAP4 connection"
+#: src/prefs_account.c:2705
+msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr ""
 
-#: src/prefs_account.c:2494
-msgid "Use SSL for NNTP connection"
+#: src/prefs_account.c:2716
+msgid "Client certificates"
 msgstr ""
 
-#: src/prefs_account.c:2498
-msgid "Send (SMTP)"
+#: src/prefs_account.c:2724
+msgid "Certificate for receiving"
 msgstr ""
 
-#: src/prefs_account.c:2502
-msgid "Don't use SSL (but, if necessary, use STARTTLS)"
+#: src/prefs_account.c:2729 src/prefs_account.c:2731 src/prefs_account.c:2757
+#: src/prefs_account.c:2759
+msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr ""
 
-#: src/prefs_account.c:2505
-msgid "Use SSL for SMTP connection"
+#: src/prefs_account.c:2752
+msgid "Certificate for sending"
 msgstr ""
 
-#: src/prefs_account.c:2513
-msgid "Client certificates"
+#: src/prefs_account.c:2792
+msgid "Automatically accept valid SSL/TLS certificates"
 msgstr ""
 
-#: src/prefs_account.c:2521
-msgid "Certificate for receiving"
+#: src/prefs_account.c:2795
+msgid "Use non-blocking SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2526 src/prefs_account.c:2528 src/prefs_account.c:2548
-#: src/prefs_account.c:2550
-msgid "Client certificate file as a PKCS12 or PEM file"
+#: src/prefs_account.c:2807
+msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr ""
 
-#: src/prefs_account.c:2543
-msgid "Certificate for sending"
+#: src/prefs_account.c:2899 src/prefs_proxy.c:73
+msgid "Use proxy server"
+msgstr ""
+
+#: src/prefs_account.c:2908
+msgctxt ""
+"In account preferences, referring to whether or not use proxy settings from "
+"common preferences"
+msgid "Use default settings"
+msgstr ""
+
+#: src/prefs_account.c:2910
+msgid "Use global proxy server settings"
+msgstr ""
+
+#: src/prefs_account.c:2947 src/prefs_proxy.c:115 src/wizard.c:1120
+msgid "Use authentication"
 msgstr ""
 
-#: src/prefs_account.c:2576
-msgid "Automatically accept valid SSL certificates"
+#: src/prefs_account.c:2952 src/prefs_proxy.c:123
+msgid "Username"
 msgstr ""
 
-#: src/prefs_account.c:2579
-msgid "Use non-blocking SSL"
+#: src/prefs_account.c:2986
+msgid "Use proxy server for sending"
 msgstr ""
 
-#: src/prefs_account.c:2591
-msgid "Turn this off if you have SSL connection problems"
+#: src/prefs_account.c:2988
+msgid ""
+"If disabled, messages will be sent using direct connection to configured "
+"outgoing server, bypassing any configured proxy server."
 msgstr ""
 
-#: src/prefs_account.c:2726
+#: src/prefs_account.c:3099
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:2733
-msgid "POP3 port"
+#: src/prefs_account.c:3106
+msgid "POP port"
 msgstr ""
 
-#: src/prefs_account.c:2740
-msgid "IMAP4 port"
+#: src/prefs_account.c:3113
+msgid "IMAP port"
 msgstr ""
 
-#: src/prefs_account.c:2747
+#: src/prefs_account.c:3120
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:2753
+#: src/prefs_account.c:3126
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:2756
+#: src/prefs_account.c:3129
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:2770
+#: src/prefs_account.c:3143
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:2779
+#: src/prefs_account.c:3152
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
-#: src/prefs_account.c:2835
+#: src/prefs_account.c:3205
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:2837
+#: src/prefs_account.c:3207
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:2839
+#: src/prefs_account.c:3209
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:2841
+#: src/prefs_account.c:3211
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:3268
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2904
+#: src/prefs_account.c:3272
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2911
+#: src/prefs_account.c:3280
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2916
+#: src/prefs_account.c:3285
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2921
-msgid "POP3 server is not entered."
+#: src/prefs_account.c:3290
+msgid "POP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2941
+#: src/prefs_account.c:3310
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:2947
-msgid "IMAP4 server is not entered."
+#: src/prefs_account.c:3316
+msgid "IMAP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2952
+#: src/prefs_account.c:3321
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2958
+#: src/prefs_account.c:3327
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:2964
+#: src/prefs_account.c:3333
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3305
+#: src/prefs_account.c:3343
+msgid "User ID cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3348
+msgid "Password cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3376
+msgid "SMTP user ID cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3381
+msgid "SMTP password cannot contain a newline character."
+msgstr ""
+
+#: src/prefs_account.c:3457
+msgid "domain is not specified."
+msgstr ""
+
+#: src/prefs_account.c:3462
+msgid "sent folder is not selected."
+msgstr ""
+
+#: src/prefs_account.c:3467
+msgid "queue folder is not selected."
+msgstr ""
+
+#: src/prefs_account.c:3472
+msgid "draft folder is not selected."
+msgstr ""
+
+#: src/prefs_account.c:3477
+msgid "trash folder is not selected."
+msgstr "wastebin folder is not selected."
+
+#: src/prefs_account.c:3760
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:3359 src/prefs_folder_item.c:1836 src/prefs_quote.c:238
+#: src/prefs_account.c:3814 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_account.c:3377
+#: src/prefs_account.c:3832
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:3489
+#: src/prefs_account.c:3962
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:3806
+#: src/prefs_account.c:4311
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:3808
+#: src/prefs_account.c:4313
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:3929 src/wizard.c:1389
+#: src/prefs_account.c:4432 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:4014
+#: src/prefs_account.c:4517
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:4032 src/prefs_account.c:4049 src/wizard.c:1066
+#: src/prefs_account.c:4535 src/prefs_account.c:4552 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4145
+#: src/prefs_account.c:4648
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:4285
+#: src/prefs_account.c:4819
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:224
 msgid "Actions configuration"
 msgstr ""
 
-#: src/prefs_actions.c:250
+#: src/prefs_actions.c:251
 msgid "Menu name"
 msgstr ""
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:284
 msgid "Shell command"
 msgstr ""
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:294
 msgid "Filter action"
 msgstr ""
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:300
 msgid "Edit filter action"
 msgstr ""
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:328
 msgid "Append the new action above to the list"
 msgstr ""
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:336
 msgid "Replace the selected action in list with the action above"
 msgstr ""
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:779 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1056
-msgid "Re_move"
+#: src/prefs_actions.c:338 src/prefs_filtering_action.c:588
+#: src/prefs_filtering.c:486 src/prefs_matcher.c:800 src/prefs_template.c:319
+#: src/prefs_toolbar.c:1024
+msgid "D_elete"
 msgstr ""
 
-#: src/prefs_actions.c:345
+#: src/prefs_actions.c:346
 msgid "Delete the selected action from the list"
 msgstr ""
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:338
+#: src/prefs_actions.c:356 src/prefs_filtering.c:503 src/prefs_template.c:337
 msgid "Clear all the input fields in the dialog"
 msgstr "Clear all the input fields in the dialogue"
 
-#: src/prefs_actions.c:363
+#: src/prefs_actions.c:364
 msgid "Show information on configuring actions"
 msgstr ""
 
-#: src/prefs_actions.c:394
+#: src/prefs_actions.c:395
 msgid "Move the selected action up"
 msgstr ""
 
-#: src/prefs_actions.c:402
+#: src/prefs_actions.c:403
 msgid "Move selected action down"
 msgstr ""
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:704
-#: src/prefs_filtering.c:836 src/prefs_filtering.c:838
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:949 src/prefs_matcher.c:896
-#: src/prefs_template.c:472
+#: src/prefs_actions.c:536 src/prefs_filtering_action.c:677
+#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
+#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:918
+#: src/prefs_template.c:471
 msgid "(New)"
 msgstr ""
 
-#: src/prefs_actions.c:600
+#: src/prefs_actions.c:601
 msgid "Menu name is not set."
 msgstr ""
 
-#: src/prefs_actions.c:605
+#: src/prefs_actions.c:606
 msgid "A leading '/' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:610
+#: src/prefs_actions.c:611
 msgid "Colon ':' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:616
-msgid "There is an action with this name already."
-msgstr ""
-
-#: src/prefs_actions.c:635
+#: src/prefs_actions.c:630
 msgid "Menu name is too long."
 msgstr ""
 
-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:639
 msgid "Command-line not set."
 msgstr ""
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:644
 msgid "Menu name and command are too long."
 msgstr ""
 
-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:650
 #, c-format
 msgid ""
 "The command\n"
@@ -13726,162 +14039,162 @@ msgid ""
 "has a syntax error."
 msgstr ""
 
-#: src/prefs_actions.c:713
+#: src/prefs_actions.c:708
 msgid "Delete action"
 msgstr ""
 
-#: src/prefs_actions.c:714
+#: src/prefs_actions.c:709
 msgid "Do you really want to delete this action?"
 msgstr ""
 
-#: src/prefs_actions.c:734
+#: src/prefs_actions.c:729
 msgid "Delete all actions"
 msgstr ""
 
-#: src/prefs_actions.c:735
+#: src/prefs_actions.c:730
 msgid "Do you really want to delete all the actions?"
 msgstr ""
 
-#: src/prefs_actions.c:898 src/prefs_actions.c:929 src/prefs_filtering.c:1497
-#: src/prefs_filtering.c:1519 src/prefs_matcher.c:2114 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1503
+#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2161 src/prefs_template.c:571
+#: src/prefs_template.c:596
 msgid "Entry not saved"
 msgstr ""
 
-#: src/prefs_actions.c:899 src/prefs_actions.c:930 src/prefs_filtering.c:1498
-#: src/prefs_filtering.c:1520 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
+#: src/prefs_filtering.c:1526 src/prefs_template.c:572 src/prefs_template.c:597
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 
-#: src/prefs_actions.c:900 src/prefs_actions.c:905 src/prefs_actions.c:931
-#: src/prefs_filtering.c:1477 src/prefs_filtering.c:1499
-#: src/prefs_filtering.c:1521 src/prefs_matcher.c:2117 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_actions.c:895 src/prefs_actions.c:900 src/prefs_actions.c:926
+#: src/prefs_filtering.c:1483 src/prefs_filtering.c:1505
+#: src/prefs_filtering.c:1527 src/prefs_matcher.c:2164 src/prefs_template.c:573
+#: src/prefs_template.c:598 src/prefs_template.c:603
 msgid "_Continue editing"
 msgstr ""
 
-#: src/prefs_actions.c:903
+#: src/prefs_actions.c:898
 msgid "Actions list not saved"
 msgstr ""
 
-#: src/prefs_actions.c:904
+#: src/prefs_actions.c:899
 msgid "The actions list has been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:969
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:970
 msgid "Use / in menu name to make submenus."
 msgstr ""
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:972
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:974
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:975
 msgid "to send user provided text to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:976
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:977
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:978
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:979
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:980
 msgid "to run command asynchronously"
 msgstr ""
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:981
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:982
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr ""
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:983
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:984
 msgid "for the file of the selected decoded message MIME part"
 msgstr ""
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:985
 msgid "for a user provided argument"
 msgstr ""
 
-#: src/prefs_actions.c:991
+#: src/prefs_actions.c:986
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 
-#: src/prefs_actions.c:992
+#: src/prefs_actions.c:987
 msgid "for the text selection"
 msgstr ""
 
-#: src/prefs_actions.c:993
+#: src/prefs_actions.c:988
 msgid "apply filtering actions between {} to selected messages"
 msgstr ""
 
-#: src/prefs_actions.c:994
+#: src/prefs_actions.c:989
 msgid "for a literal %"
 msgstr ""
 
-#: src/prefs_actions.c:1004 src/prefs_themes.c:935
+#: src/prefs_actions.c:999 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr ""
 
-#: src/prefs_actions.c:1005
+#: src/prefs_actions.c:1000
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
 msgstr ""
 
-#: src/prefs_actions.c:1092 src/prefs_filtering.c:1695
-#: src/prefs_template.c:1121
+#: src/prefs_actions.c:1087 src/prefs_filtering.c:1701
+#: src/prefs_template.c:1113
 msgid "D_uplicate"
 msgstr ""
 
-#: src/prefs_actions.c:1212
+#: src/prefs_actions.c:1207
 msgid "Current actions"
 msgstr ""
 
-#: src/prefs_actions.c:1311 src/prefs_filtering.c:1074
-#: src/prefs_filtering.c:1132
+#: src/prefs_actions.c:1306 src/prefs_filtering.c:1078
+#: src/prefs_filtering.c:1136
 msgid "Action string is not valid."
 msgstr ""
 
-#: src/prefs_common.c:223 src/prefs_quote.c:69
+#: src/prefs_common.c:239 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr ""
 
-#: src/prefs_common.c:301
+#: src/prefs_common.c:317
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr ""
 
-#: src/prefs_common.c:307 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"
@@ -13891,35 +14204,35 @@ msgstr ""
 msgid "%x(%a) %H:%M"
 msgstr ""
 
-#: src/prefs_compose_writing.c:125
+#: src/prefs_compose_writing.c:126
 msgid "Automatic account selection"
 msgstr ""
 
-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:134
 msgid "when replying"
 msgstr ""
 
-#: src/prefs_compose_writing.c:135
+#: src/prefs_compose_writing.c:136
 msgid "when forwarding"
 msgstr ""
 
-#: src/prefs_compose_writing.c:137
+#: src/prefs_compose_writing.c:138
 msgid "when re-editing"
 msgstr ""
 
-#: src/prefs_compose_writing.c:140
+#: src/prefs_compose_writing.c:141
 msgid "Editing"
 msgstr ""
 
-#: src/prefs_compose_writing.c:144
+#: src/prefs_compose_writing.c:145
 msgid "Automatically launch the external editor"
 msgstr ""
 
-#: src/prefs_compose_writing.c:152
+#: src/prefs_compose_writing.c:153
 msgid "Automatically save message to Drafts folder every"
 msgstr ""
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:101
+#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr ""
 
@@ -13931,36 +14244,37 @@ msgstr ""
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:197
 msgid "Warn when inserting a file larger than"
 msgstr ""
 
-#: src/prefs_compose_writing.c:210
+#: src/prefs_compose_writing.c:208
 msgid "KB into message body "
 msgstr ""
 
-#: src/prefs_compose_writing.c:216
+#: src/prefs_compose_writing.c:214
 msgid "Replying"
 msgstr ""
 
-#: src/prefs_compose_writing.c:219
+#: src/prefs_compose_writing.c:217
 msgid "Reply will quote by default"
 msgstr ""
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:220
 msgid "Reply button invokes mailing list reply"
 msgstr ""
 
-#: src/prefs_compose_writing.c:224
+#: src/prefs_compose_writing.c:222
 msgid "Forwarding"
 msgstr ""
 
-#: src/prefs_compose_writing.c:227 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
 msgid "Forward as attachment"
 msgstr ""
 
-#: src/prefs_compose_writing.c:230
-msgid "Keep the original 'From' header when redirecting"
+#: src/prefs_compose_writing.c:227
+#, c-format
+msgid "Keep the original '%s' header when redirecting"
 msgstr ""
 
 #: src/prefs_compose_writing.c:233
@@ -13971,11 +14285,11 @@ msgstr ""
 msgid "Ask"
 msgstr ""
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:427
+#: src/prefs_compose_writing.c:243 src/toolbar.c:522
 msgid "Insert"
 msgstr ""
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:428
+#: src/prefs_compose_writing.c:244 src/toolbar.c:523
 msgid "Attach"
 msgstr ""
 
@@ -13983,97 +14297,97 @@ msgstr ""
 msgid "Writing"
 msgstr ""
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:184
 msgid "Custom header configuration"
 msgstr ""
 
-#: src/prefs_customheader.c:506 src/prefs_display_header.c:599
-#: src/prefs_matcher.c:1594 src/prefs_matcher.c:1609
+#: src/prefs_customheader.c:503 src/prefs_display_header.c:590
+#: src/prefs_matcher.c:1633 src/prefs_matcher.c:1648
 msgid "Header name is not set."
 msgstr ""
 
-#: src/prefs_customheader.c:516
+#: src/prefs_customheader.c:513
 msgid "This Header name is not allowed as a custom header."
 msgstr ""
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:560
 msgid "Choose a PNG file"
 msgstr ""
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:562
 msgid "Choose an XBM file"
 msgstr ""
 
-#: src/prefs_customheader.c:567
+#: src/prefs_customheader.c:564
 msgid "Choose a text file"
 msgstr ""
 
-#: src/prefs_customheader.c:580
+#: src/prefs_customheader.c:577
 msgid "This file isn't an image."
 msgstr ""
 
-#: src/prefs_customheader.c:585
+#: src/prefs_customheader.c:582
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr ""
 
-#: src/prefs_customheader.c:591
+#: src/prefs_customheader.c:588
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr ""
 
-#: src/prefs_customheader.c:596
+#: src/prefs_customheader.c:593
 msgid "The image isn't in the correct format (PNG)."
 msgstr ""
 
-#: src/prefs_customheader.c:605
+#: src/prefs_customheader.c:602
 msgid "The image isn't in the correct format (XBM)."
 msgstr ""
 
-#: src/prefs_customheader.c:614
+#: src/prefs_customheader.c:611
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 
-#: src/prefs_customheader.c:620
+#: src/prefs_customheader.c:617
 #, c-format
 msgid "Compface error: %s"
 msgstr ""
 
-#: src/prefs_customheader.c:673
+#: src/prefs_customheader.c:670
 msgid "This file contains newlines."
 msgstr ""
 
-#: src/prefs_customheader.c:703
+#: src/prefs_customheader.c:700
 msgid "Delete header"
 msgstr ""
 
-#: src/prefs_customheader.c:704
+#: src/prefs_customheader.c:701
 msgid "Do you really want to delete this header?"
 msgstr ""
 
-#: src/prefs_customheader.c:877
+#: src/prefs_customheader.c:874
 msgid "Current custom headers"
 msgstr ""
 
-#: src/prefs_display_header.c:250
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr ""
 
-#: src/prefs_display_header.c:274
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr ""
 
-#: src/prefs_display_header.c:317
+#: src/prefs_display_header.c:312
 msgid "Displayed Headers"
 msgstr ""
 
-#: src/prefs_display_header.c:379
+#: src/prefs_display_header.c:374
 msgid "Hidden headers"
 msgstr ""
 
-#: src/prefs_display_header.c:405
+#: src/prefs_display_header.c:400
 msgid "Show all unspecified headers"
 msgstr ""
 
-#: src/prefs_display_header.c:609
+#: src/prefs_display_header.c:600
 msgid "This header is already in the list."
 msgstr ""
 
@@ -14109,7 +14423,7 @@ msgid ""
 msgstr ""
 
 #: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:354
+#: src/prefs_message.c:351
 msgid "Message View"
 msgstr ""
 
@@ -14117,200 +14431,200 @@ msgstr ""
 msgid "External Programs"
 msgstr ""
 
-#: src/prefs_filtering_action.c:175
+#: src/prefs_filtering_action.c:171
 msgid "Move"
 msgstr ""
 
-#: src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:172
 msgid "Copy"
 msgstr ""
 
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr ""
 
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr ""
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:78 src/summaryview.c:2776
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:616
+#: src/prefs_summary_column.c:77 src/summaryview.c:2855 src/toolbar.c:505
 msgid "Mark"
 msgstr ""
 
-#: src/prefs_filtering_action.c:183
+#: src/prefs_filtering_action.c:179
 msgid "Mark as read"
 msgstr ""
 
-#: src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:180
 msgid "Mark as unread"
 msgstr ""
 
-#: src/prefs_filtering_action.c:185
+#: src/prefs_filtering_action.c:181
 msgid "Mark as spam"
 msgstr ""
 
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:182
 msgid "Mark as ham"
 msgstr ""
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1438
-#: src/toolbar.c:205 src/toolbar.c:438 src/toolbar.c:2088
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1394
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr ""
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:440
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:614
 msgid "Color label"
 msgstr "Colour label"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
 msgid "Resend"
 msgstr ""
 
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:187
 msgid "Redirect"
 msgstr ""
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1442 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:445 src/prefs_summary_column.c:87
-#: src/summaryview.c:446
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:1398 src/prefs_matcher.c:639
+#: src/prefs_summaries.c:619 src/prefs_summary_column.c:86
+#: src/summaryview.c:457
 msgid "Score"
 msgstr ""
 
-#: src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:188
 msgid "Change score"
 msgstr ""
 
-#: src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:189
 msgid "Set score"
 msgstr ""
 
-#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:89 src/summaryview.c:448
+#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:459
 msgid "Tags"
 msgstr ""
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:190
 msgid "Apply tag"
 msgstr ""
 
-#: src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:191
 msgid "Unset tag"
 msgstr ""
 
-#: src/prefs_filtering_action.c:198
+#: src/prefs_filtering_action.c:192
 msgid "Clear tags"
 msgstr ""
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
 msgid "Threads"
 msgstr ""
 
-#: src/prefs_filtering_action.c:202
+#: src/prefs_filtering_action.c:196
 msgid "Stop filter"
 msgstr ""
 
-#: src/prefs_filtering_action.c:410
+#: src/prefs_filtering_action.c:400
 msgid "Action configuration"
 msgstr ""
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1886
-#: src/prefs_matcher.c:586
+#: src/prefs_filtering_action.c:417 src/prefs_filtering.c:1894
+#: src/prefs_matcher.c:596
 msgid "Rule"
 msgstr ""
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:433
 msgid "Action"
 msgstr ""
 
-#: src/prefs_filtering_action.c:935
+#: src/prefs_filtering_action.c:906
 msgid "Command-line not set"
 msgstr ""
 
-#: src/prefs_filtering_action.c:936
+#: src/prefs_filtering_action.c:907
 msgid "Destination is not set."
 msgstr ""
 
-#: src/prefs_filtering_action.c:947
+#: src/prefs_filtering_action.c:918
 msgid "Recipient is not set."
 msgstr ""
 
-#: src/prefs_filtering_action.c:965
+#: src/prefs_filtering_action.c:934
 msgid "Score is not set"
 msgstr ""
 
-#: src/prefs_filtering_action.c:973
+#: src/prefs_filtering_action.c:942
 msgid "Header is not set."
 msgstr ""
 
-#: src/prefs_filtering_action.c:980
+#: src/prefs_filtering_action.c:949
 msgid "Target addressbook/folder is not set."
 msgstr ""
 
-#: src/prefs_filtering_action.c:994
+#: src/prefs_filtering_action.c:959
 msgid "Tag name is empty."
 msgstr ""
 
-#: src/prefs_filtering_action.c:1216
+#: src/prefs_filtering_action.c:1181
 msgid "No action was defined."
 msgstr ""
 
-#: src/prefs_filtering_action.c:1254 src/prefs_matcher.c:2160
+#: src/prefs_filtering_action.c:1219 src/prefs_matcher.c:2208
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1263 src/prefs_matcher.c:2169
+#: src/prefs_filtering_action.c:1228 src/prefs_matcher.c:2217
 msgid "filename (should not be modified)"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1264 src/prefs_matcher.c:2170
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2218
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1265 src/prefs_matcher.c:2171
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2219
 msgid "escape character for quotes"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2220
 msgid "quote character"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1275
+#: src/prefs_filtering_action.c:1240
 msgid "Filtering Action: 'Execute'"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1276
+#: src/prefs_filtering_action.c:1241
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
 "The following symbols can be used:"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1422
+#: src/prefs_filtering_action.c:1380
 msgid "Recipient"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1384
 msgid "Book/Folder"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1388
 msgid "Destination"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1391
 msgid "Color"
 msgstr "Colour"
 
-#: src/prefs_filtering_action.c:1520
+#: src/prefs_filtering_action.c:1476
 msgid "Current action list"
 msgstr ""
 
@@ -14318,8 +14632,8 @@ msgstr ""
 msgid "Filtering/Processing configuration"
 msgstr ""
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:867
-#: src/prefs_filtering.c:981
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
+#: src/prefs_filtering.c:985
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr ""
@@ -14329,7 +14643,7 @@ msgid "Condition"
 msgstr ""
 
 #: src/prefs_filtering.c:424
-msgid " D_efine... "
+msgid " Def_ine... "
 msgstr ""
 
 #: src/prefs_filtering.c:446
@@ -14348,91 +14662,91 @@ msgstr ""
 msgid "Delete the selected rule from the list"
 msgstr ""
 
-#: src/prefs_filtering.c:532
+#: src/prefs_filtering.c:534
 msgid "Move the selected rule to the top"
 msgstr ""
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:537
 msgid "Page u_p"
 msgstr ""
 
-#: src/prefs_filtering.c:543
+#: src/prefs_filtering.c:545
 msgid "Move the selected rule one page up"
 msgstr ""
 
-#: src/prefs_filtering.c:552
+#: src/prefs_filtering.c:554
 msgid "Move the selected rule up"
 msgstr ""
 
-#: src/prefs_filtering.c:560
+#: src/prefs_filtering.c:562
 msgid "Move the selected rule down"
 msgstr ""
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:565
 msgid "Page dow_n"
 msgstr ""
 
-#: src/prefs_filtering.c:571
+#: src/prefs_filtering.c:573
 msgid "Move the selected rule one page down"
 msgstr ""
 
-#: src/prefs_filtering.c:580
+#: src/prefs_filtering.c:582
 msgid "Move the selected rule to the bottom"
 msgstr ""
 
-#: src/prefs_filtering.c:1038 src/prefs_filtering.c:1124
+#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
 msgid "Condition string is not valid."
 msgstr ""
 
-#: src/prefs_filtering.c:1111
+#: src/prefs_filtering.c:1115
 msgid "Condition string is empty."
 msgstr ""
 
-#: src/prefs_filtering.c:1117
+#: src/prefs_filtering.c:1121
 msgid "Action string is empty."
 msgstr ""
 
-#: src/prefs_filtering.c:1205
+#: src/prefs_filtering.c:1210
 msgid "Delete rule"
 msgstr ""
 
-#: src/prefs_filtering.c:1206
+#: src/prefs_filtering.c:1211
 msgid "Do you really want to delete this rule?"
 msgstr ""
 
-#: src/prefs_filtering.c:1224
+#: src/prefs_filtering.c:1229
 msgid "Delete all rules"
 msgstr ""
 
-#: src/prefs_filtering.c:1225
+#: src/prefs_filtering.c:1230
 msgid "Do you really want to delete all the rules?"
 msgstr ""
 
-#: src/prefs_filtering.c:1475
+#: src/prefs_filtering.c:1481
 msgid "Filtering rules not saved"
 msgstr ""
 
-#: src/prefs_filtering.c:1476
+#: src/prefs_filtering.c:1482
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_filtering.c:1698
+#: src/prefs_filtering.c:1704
 msgid "Move one page up"
 msgstr ""
 
-#: src/prefs_filtering.c:1699
+#: src/prefs_filtering.c:1705
 msgid "Move one page down"
 msgstr ""
 
-#: src/prefs_filtering.c:1854
+#: src/prefs_filtering.c:1862
 msgid "Enable"
 msgstr ""
 
-#: src/prefs_folder_column.c:212
+#: src/prefs_folder_column.c:211
 msgid "Folder list columns configuration"
 msgstr ""
 
-#: src/prefs_folder_column.c:229
+#: src/prefs_folder_column.c:228
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -14442,149 +14756,155 @@ msgstr ""
 msgid "Hidden columns"
 msgstr ""
 
-#: src/prefs_folder_column.c:290 src/prefs_summaries.c:409
-#: src/prefs_summaries.c:587 src/prefs_summary_column.c:304
+#: src/prefs_folder_column.c:299 src/prefs_summaries.c:382
+#: src/prefs_summaries.c:447 src/prefs_summary_column.c:313
 msgid "Displayed columns"
 msgstr ""
 
-#: src/prefs_folder_column.c:329 src/prefs_msg_colors.c:494
-#: src/prefs_summary_column.c:343 src/prefs_toolbar.c:1064
+#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:425
+#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1032
 msgid " Use default "
 msgstr ""
 
-#: src/prefs_folder_item.c:262 src/prefs_folder_item.c:864
-#: src/prefs_folder_item.c:1390
+#: src/prefs_folder_item.c:214
 msgid ""
-"These preferences will not be saved as this folder is a top-level folder. "
+"These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
 "subfolders\"."
 msgstr ""
 
-#: src/prefs_folder_item.c:274 src/prefs_folder_item.c:876
+#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:299
+#: src/prefs_folder_item.c:318
 msgid "Normal"
 msgstr ""
 
-#: src/prefs_folder_item.c:301
+#: src/prefs_folder_item.c:320
 msgid "Outbox"
 msgstr ""
 
-#: src/prefs_folder_item.c:317
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr ""
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:348
 msgid "Simplify Subject RegExp"
 msgstr ""
 
-#: src/prefs_folder_item.c:355
-msgid "Test string:"
+#: src/prefs_folder_item.c:374
+msgid "Test string"
 msgstr ""
 
-#: src/prefs_folder_item.c:372
-msgid "Result:"
+#: src/prefs_folder_item.c:391
+msgid "Result"
 msgstr ""
 
-#: src/prefs_folder_item.c:387
+#: src/prefs_folder_item.c:406
 msgid "Folder chmod"
 msgstr ""
 
-#: src/prefs_folder_item.c:413
+#: src/prefs_folder_item.c:432
 msgid "Folder color"
 msgstr "Folder colour"
 
-#: src/prefs_folder_item.c:426 src/prefs_folder_item.c:1659
+#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 
-#: src/prefs_folder_item.c:444
+#: src/prefs_folder_item.c:462
 msgid "Run Processing rules at start-up"
 msgstr ""
 
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:477
 msgid "Run Processing rules when opening"
 msgstr ""
 
-#: src/prefs_folder_item.c:473
+#: src/prefs_folder_item.c:491
 msgid "Scan for new mail"
 msgstr ""
 
-#: src/prefs_folder_item.c:475
+#: src/prefs_folder_item.c:493
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
 msgstr ""
 
-#: src/prefs_folder_item.c:495
+#: src/prefs_folder_item.c:513
 msgid "Select the HTML part of multipart messages"
 msgstr ""
 
-#: src/prefs_folder_item.c:512
+#: src/prefs_folder_item.c:530
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
 
-#: src/prefs_folder_item.c:522
+#: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
 msgstr ""
 
-#: src/prefs_folder_item.c:543
+#: src/prefs_folder_item.c:561
 msgid "Fetch message bodies from the last"
 msgstr ""
 
-#: src/prefs_folder_item.c:550
+#: src/prefs_folder_item.c:568
 msgid "0: all bodies"
 msgstr ""
 
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:576
 msgid "Remove older messages bodies"
 msgstr ""
 
-#: src/prefs_folder_item.c:575
+#: src/prefs_folder_item.c:593
 msgid "Discard folder cache"
 msgstr ""
 
-#: src/prefs_folder_item.c:885
+#: src/prefs_folder_item.c:905
 msgid "Request Return Receipt"
 msgstr ""
 
-#: src/prefs_folder_item.c:900
+#: src/prefs_folder_item.c:920
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 
-#: src/prefs_folder_item.c:913 src/prefs_folder_item.c:936
-#: src/prefs_folder_item.c:960 src/prefs_folder_item.c:983
-#: src/prefs_folder_item.c:1006
-msgid "Default "
+#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
+#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s"
 msgstr ""
 
-#: src/prefs_folder_item.c:937
-msgid " for replies"
+#: src/prefs_folder_item.c:960
+#, c-format
+msgctxt "folder properties: %s stands for a header name"
+msgid "Default %s for replies"
 msgstr ""
 
-#: src/prefs_folder_item.c:1029
+#: src/prefs_folder_item.c:1063
 msgid "Default account"
 msgstr ""
 
-#: src/prefs_folder_item.c:1672
+#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+msgid "\"Default\" will follow the applicable account preference"
+msgstr ""
+
+#: src/prefs_folder_item.c:1781
 msgid "Discard cache"
 msgstr ""
 
-#: src/prefs_folder_item.c:1673
+#: src/prefs_folder_item.c:1782
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
 
-#: src/prefs_folder_item.c:1803
+#: src/prefs_folder_item.c:1907
 msgid "General"
 msgstr ""
 
-#: src/prefs_folder_item.c:1882
+#: src/prefs_folder_item.c:1986
 #, c-format
 msgid "Properties for folder %s"
 msgstr ""
@@ -14593,7 +14913,7 @@ msgstr ""
 msgid "Folder and Message Lists"
 msgstr ""
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2035
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2082
 msgid "Message"
 msgstr ""
 
@@ -14617,8 +14937,8 @@ msgstr ""
 msgid "Message Printing"
 msgstr ""
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:839 src/prefs_summaries.c:731
-#: src/prefs_themes.c:365
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:731 src/prefs_summaries.c:820
+#: src/prefs_themes.c:422
 msgid "Display"
 msgstr ""
 
@@ -14626,7 +14946,7 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs_gtk.c:911 src/toolbar.c:213 src/toolbar.c:423
+#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr ""
 
@@ -14654,27 +14974,27 @@ msgstr ""
 msgid "Image Viewer"
 msgstr ""
 
-#: src/prefs_logging.c:147 src/prefs_logging.c:254
+#: src/prefs_logging.c:143 src/prefs_logging.c:249
 msgid "Restrict the log window to"
 msgstr ""
 
-#: src/prefs_logging.c:159 src/prefs_logging.c:266
+#: src/prefs_logging.c:154 src/prefs_logging.c:260
 msgid "0 to stop logging in the log window"
 msgstr ""
 
-#: src/prefs_logging.c:161 src/prefs_logging.c:268
+#: src/prefs_logging.c:156 src/prefs_logging.c:262
 msgid "lines"
 msgstr ""
 
-#: src/prefs_logging.c:171
+#: src/prefs_logging.c:165
 msgid "Filtering/processing log"
 msgstr ""
 
-#: src/prefs_logging.c:174
+#: src/prefs_logging.c:168
 msgid "Enable logging of filtering/processing rules"
 msgstr ""
 
-#: src/prefs_logging.c:180
+#: src/prefs_logging.c:174
 msgid ""
 "If checked, turns on logging of filtering and processing rules.\n"
 "The log is accessible from 'Tools/Filtering log'.\n"
@@ -14682,47 +15002,47 @@ msgid ""
 "might be critical when applying many rules upon thousands of messages."
 msgstr ""
 
-#: src/prefs_logging.c:187
+#: src/prefs_logging.c:181
 msgid "Log filtering/processing when..."
 msgstr ""
 
-#: src/prefs_logging.c:191
+#: src/prefs_logging.c:185
 msgid "filtering at incorporation"
 msgstr ""
 
-#: src/prefs_logging.c:193
+#: src/prefs_logging.c:187
 msgid "pre-processing folders"
 msgstr ""
 
-#: src/prefs_logging.c:198
+#: src/prefs_logging.c:192
 msgid "manually filtering"
 msgstr ""
 
-#: src/prefs_logging.c:200
+#: src/prefs_logging.c:194
 msgid "post-processing folders"
 msgstr ""
 
-#: src/prefs_logging.c:207
+#: src/prefs_logging.c:201
 msgid "processing folders"
 msgstr ""
 
-#: src/prefs_logging.c:222
+#: src/prefs_logging.c:217
 msgid "Log level"
 msgstr ""
 
-#: src/prefs_logging.c:231
+#: src/prefs_logging.c:226
 msgid "Low"
 msgstr ""
 
-#: src/prefs_logging.c:232
+#: src/prefs_logging.c:227
 msgid "Medium"
 msgstr ""
 
-#: src/prefs_logging.c:233
+#: src/prefs_logging.c:228
 msgid "High"
 msgstr ""
 
-#: src/prefs_logging.c:238
+#: src/prefs_logging.c:233
 msgid ""
 "Select the level of detail of the logging.\n"
 "Choose Low to see when rules are applied, which conditions match or don't "
@@ -14734,279 +15054,291 @@ msgid ""
 "Caution: the higher the level, the greater the impact on performance."
 msgstr ""
 
-#: src/prefs_logging.c:280
+#: src/prefs_logging.c:274
 msgid "Disk log"
 msgstr ""
 
-#: src/prefs_logging.c:282
+#: src/prefs_logging.c:276
 msgid "Write the following information to disk..."
 msgstr ""
 
-#: src/prefs_logging.c:290
+#: src/prefs_logging.c:284
 msgid "Warning messages"
 msgstr ""
 
-#: src/prefs_logging.c:291
+#: src/prefs_logging.c:285
 msgid "Network protocol messages"
 msgstr ""
 
-#: src/prefs_logging.c:295
+#: src/prefs_logging.c:289
 msgid "Error messages"
 msgstr ""
 
-#: src/prefs_logging.c:296
+#: src/prefs_logging.c:290
 msgid "Status messages for filtering/processing log"
 msgstr ""
 
-#: src/prefs_logging.c:427 src/prefs_msg_colors.c:145 src/prefs_other.c:777
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:784
 msgid "Other"
 msgstr ""
 
-#: src/prefs_logging.c:428
+#: src/prefs_logging.c:411
 msgid "Logging"
 msgstr ""
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:335
 msgid "more than"
 msgstr ""
 
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:336
 msgid "less than"
 msgstr ""
 
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:342
 msgid "weeks"
 msgstr ""
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:346
+msgid "after"
+msgstr ""
+
+#: src/prefs_matcher.c:347
+msgid "before"
+msgstr ""
+
+#: src/prefs_matcher.c:351
 msgid "higher than"
 msgstr ""
 
-#: src/prefs_matcher.c:343
+#: src/prefs_matcher.c:352
 msgid "lower than"
 msgstr ""
 
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
+#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
 msgid "exactly"
 msgstr ""
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:357
 msgid "greater than"
 msgstr ""
 
-#: src/prefs_matcher.c:349
+#: src/prefs_matcher.c:358
 msgid "smaller than"
 msgstr ""
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:363
 msgid "bytes"
 msgstr ""
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:364
 msgid "kilobytes"
 msgstr ""
 
-#: src/prefs_matcher.c:356
+#: src/prefs_matcher.c:365
 msgid "megabytes"
 msgstr ""
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:369
 msgid "contains"
 msgstr ""
 
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:370
 msgid "doesn't contain"
 msgstr ""
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:394
 msgid "headers part"
 msgstr ""
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:395
 msgid "headers values"
 msgstr ""
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:396
 msgid "body part"
 msgstr ""
 
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:397
 msgid "whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6282
+#: src/prefs_matcher.c:403 src/summaryview.c:6500
 msgid "Marked"
 msgstr ""
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6280
+#: src/prefs_matcher.c:404 src/summaryview.c:6498
 msgid "Deleted"
 msgstr ""
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:405
 msgid "Replied"
 msgstr ""
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6274
+#: src/prefs_matcher.c:406 src/summaryview.c:6492
 msgid "Forwarded"
 msgstr ""
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6264 src/toolbar.c:416
-#: src/toolbar.c:934 src/toolbar.c:1978
+#: src/prefs_matcher.c:408 src/summaryview.c:6482 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr ""
 
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:409
 msgid "Has attachment"
 msgstr ""
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6300
+#: src/prefs_matcher.c:410 src/summaryview.c:6518
 msgid "Signed"
 msgstr ""
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:414
 msgid "set"
 msgstr ""
 
-#: src/prefs_matcher.c:406
+#: src/prefs_matcher.c:415
 msgid "not set"
 msgstr ""
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:419
 msgid "yes"
 msgstr ""
 
-#: src/prefs_matcher.c:411
+#: src/prefs_matcher.c:420
 msgid "no"
 msgstr ""
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:424
 msgid "Any tags"
 msgstr ""
 
-#: src/prefs_matcher.c:416
+#: src/prefs_matcher.c:425
 msgid "Specific tag"
 msgstr ""
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:429
 msgid "ignored"
 msgstr ""
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:430
 msgid "not ignored"
 msgstr ""
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:431
 msgid "watched"
 msgstr ""
 
-#: src/prefs_matcher.c:423
+#: src/prefs_matcher.c:432
 msgid "not watched"
 msgstr ""
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:436
 msgid "found"
 msgstr ""
 
-#: src/prefs_matcher.c:428
+#: src/prefs_matcher.c:437
 msgid "not found"
 msgstr ""
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:441
 msgid "0 (Passed)"
 msgstr ""
 
-#: src/prefs_matcher.c:433
+#: src/prefs_matcher.c:442
 msgid "non-0 (Failed)"
 msgstr ""
 
-#: src/prefs_matcher.c:569
+#: src/prefs_matcher.c:579
 msgid "Condition configuration"
 msgstr ""
 
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
+#: src/prefs_matcher.c:623
+msgid "Match criteria"
 msgstr ""
 
-#: src/prefs_matcher.c:622
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr ""
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr ""
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr ""
 
-#: src/prefs_matcher.c:626
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr ""
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:410
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:341
 msgid "Color labels"
 msgstr "Colour labels"
 
-#: src/prefs_matcher.c:628
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr ""
 
-#: src/prefs_matcher.c:631
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr ""
 
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr ""
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1615 src/prefs_matcher.c:1630
-#: src/prefs_matcher.c:2516
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1654 src/prefs_matcher.c:1669
+#: src/prefs_matcher.c:2579
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr ""
 
-#: src/prefs_matcher.c:743
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr ""
 
-#: src/prefs_matcher.c:819
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr ""
 
-#: src/prefs_matcher.c:823
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr ""
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr ""
 
-#: src/prefs_matcher.c:827
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr ""
 
-#: src/prefs_matcher.c:1533 src/prefs_matcher.c:1599
+#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1638
 msgid "Search pattern is not set."
 msgstr ""
 
-#: src/prefs_matcher.c:1542
+#: src/prefs_matcher.c:1574
+msgid "Invalid hour."
+msgstr ""
+
+#: src/prefs_matcher.c:1583
 msgid "Test command is not set."
 msgstr ""
 
-#: src/prefs_matcher.c:1616
+#: src/prefs_matcher.c:1655
 msgid "all addresses in all headers"
 msgstr ""
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1658
 msgid "any address in any header"
 msgstr ""
 
-#: src/prefs_matcher.c:1621
+#: src/prefs_matcher.c:1660
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr ""
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1661
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15015,93 +15347,97 @@ msgid ""
 "'%s' from the book/folder drop-down list."
 msgstr ""
 
-#: src/prefs_matcher.c:1841
+#: src/prefs_matcher.c:1880
 msgid "Headers part"
 msgstr ""
 
-#: src/prefs_matcher.c:1845
+#: src/prefs_matcher.c:1884
 msgid "Headers values"
 msgstr ""
 
-#: src/prefs_matcher.c:1849
+#: src/prefs_matcher.c:1888
 msgid "Body part"
 msgstr ""
 
-#: src/prefs_matcher.c:1853
+#: src/prefs_matcher.c:1892
 msgid "Whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:1966 src/prefs_matcher.c:2008
+#: src/prefs_matcher.c:2009 src/prefs_matcher.c:2055
 msgid "in"
 msgstr ""
 
-#: src/prefs_matcher.c:1968
+#: src/prefs_matcher.c:2011
 msgid "content is"
 msgstr ""
 
-#: src/prefs_matcher.c:1977
+#: src/prefs_matcher.c:2015
+msgid "Date is"
+msgstr ""
+
+#: src/prefs_matcher.c:2026
 msgid "Age is"
 msgstr ""
 
-#: src/prefs_matcher.c:1982
+#: src/prefs_matcher.c:2031
 msgid "Flag"
 msgstr ""
 
-#: src/prefs_matcher.c:1983 src/prefs_matcher.c:1998
+#: src/prefs_matcher.c:2032 src/prefs_matcher.c:2046
 msgid "is"
 msgstr ""
 
-#: src/prefs_matcher.c:1988
+#: src/prefs_matcher.c:2037
 msgid "Name:"
 msgstr ""
 
-#: src/prefs_matcher.c:1997
+#: src/prefs_matcher.c:2045
 msgid "Label"
 msgstr ""
 
-#: src/prefs_matcher.c:2003
+#: src/prefs_matcher.c:2050
 msgid "Value:"
 msgstr ""
 
-#: src/prefs_matcher.c:2018
+#: src/prefs_matcher.c:2065
 msgid "Score is"
 msgstr ""
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2066
 msgid "points"
 msgstr ""
 
-#: src/prefs_matcher.c:2029
+#: src/prefs_matcher.c:2076
 msgid "Size is"
 msgstr ""
 
-#: src/prefs_matcher.c:2034
+#: src/prefs_matcher.c:2081
 msgid "Scope:"
 msgstr ""
 
-#: src/prefs_matcher.c:2036
+#: src/prefs_matcher.c:2083
 msgid "tags"
 msgstr ""
 
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2088
 msgid "type is"
 msgstr ""
 
-#: src/prefs_matcher.c:2045
+#: src/prefs_matcher.c:2092
 msgid "Program returns"
 msgstr ""
 
-#: src/prefs_matcher.c:2115
+#: src/prefs_matcher.c:2162
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
 
-#: src/prefs_matcher.c:2181
+#: src/prefs_matcher.c:2229
 msgid "Match Type: 'Test'"
 msgstr ""
 
-#: src/prefs_matcher.c:2182
+#: src/prefs_matcher.c:2230
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -15109,91 +15445,91 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: src/prefs_matcher.c:2281
+#: src/prefs_matcher.c:2329
 msgid "Current condition rules"
 msgstr ""
 
-#: src/prefs_message.c:120
+#: src/prefs_message.c:119
 msgid "Headers"
 msgstr ""
 
-#: src/prefs_message.c:123
+#: src/prefs_message.c:122
 msgid "Display header pane above message view"
 msgstr ""
 
-#: src/prefs_message.c:127
+#: src/prefs_message.c:126
 msgid "Display (X-)Face in message view"
 msgstr ""
 
-#: src/prefs_message.c:130
+#: src/prefs_message.c:129
 msgid "Display Face in message view"
 msgstr ""
 
-#: src/prefs_message.c:144
+#: src/prefs_message.c:143
 msgid "Display headers in message view"
 msgstr ""
 
-#: src/prefs_message.c:156
+#: src/prefs_message.c:155
 msgid "HTML messages"
 msgstr ""
 
-#: src/prefs_message.c:159
+#: src/prefs_message.c:158
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_message.c:162
+#: src/prefs_message.c:161
 msgid "Render HTML-only messages with plugin if possible"
 msgstr ""
 
-#: src/prefs_message.c:165
+#: src/prefs_message.c:164
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr ""
 
-#: src/prefs_message.c:175
+#: src/prefs_message.c:174
 msgid "Line space"
 msgstr ""
 
-#: src/prefs_message.c:189 src/prefs_message.c:223
+#: src/prefs_message.c:187 src/prefs_message.c:220
 msgid "pixels"
 msgstr ""
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:193
 msgid "Scroll"
 msgstr ""
 
-#: src/prefs_message.c:197
+#: src/prefs_message.c:195
 msgid "Half page"
 msgstr ""
 
-#: src/prefs_message.c:203
+#: src/prefs_message.c:201
 msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_message.c:209
+#: src/prefs_message.c:207
 msgid "Step"
 msgstr ""
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:227
 msgid "Show attachment descriptions (rather than names)"
 msgstr ""
 
-#: src/prefs_message.c:233
+#: src/prefs_message.c:230
 msgid "Quotation"
 msgstr ""
 
-#: src/prefs_message.c:242
+#: src/prefs_message.c:239
 msgid "Collapse quoted text on double click"
 msgstr ""
 
-#: src/prefs_message.c:249
-msgid "Treat these characters as quotation marks: "
+#: src/prefs_message.c:246
+msgid "Treat these characters as quotation marks"
 msgstr ""
 
-#: src/prefs_message.c:355
+#: src/prefs_message.c:352
 msgid "Text Options"
 msgstr ""
 
-#: src/prefs_migration.c:95
+#: src/prefs_migration.c:51
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -15206,122 +15542,124 @@ msgid ""
 "Do you want to exit now?"
 msgstr ""
 
-#: src/prefs_migration.c:104
+#: src/prefs_migration.c:60
 msgid "Configuration warning"
 msgstr ""
 
-#: src/prefs_msg_colors.c:147
+#: src/prefs_msg_colors.c:153
 msgid "Message view"
 msgstr ""
 
-#: src/prefs_msg_colors.c:154
+#: src/prefs_msg_colors.c:160
 msgid "Enable coloration of message text"
 msgstr "Enable colouration of message text"
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:168
 msgid "Quote"
 msgstr ""
 
-#: src/prefs_msg_colors.c:174
+#: src/prefs_msg_colors.c:180
 msgid "Cycle quote colors"
 msgstr "Cycle quote colours"
 
-#: src/prefs_msg_colors.c:178
+#: src/prefs_msg_colors.c:184
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "If there are more than 3 quote levels, the colours will be reused"
 
-#: src/prefs_msg_colors.c:184
+#: src/prefs_msg_colors.c:190
 msgid "1st Level"
 msgstr ""
 
-#: src/prefs_msg_colors.c:190 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:242
+#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:232
 msgid "Text"
 msgstr ""
 
-#: src/prefs_msg_colors.c:204
+#: src/prefs_msg_colors.c:200
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Pick colour for 1st level text"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:208
 msgid "2nd Level"
 msgstr ""
 
-#: src/prefs_msg_colors.c:230
+#: src/prefs_msg_colors.c:218
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Pick colour for 2nd level text"
 
-#: src/prefs_msg_colors.c:236
+#: src/prefs_msg_colors.c:226
 msgid "3rd Level"
 msgstr ""
 
-#: src/prefs_msg_colors.c:256
+#: src/prefs_msg_colors.c:236
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Pick colour for 3rd level text"
 
-#: src/prefs_msg_colors.c:263
+#: src/prefs_msg_colors.c:245
 msgid "Enable coloration of text background"
 msgstr "Enable colouration of text background"
 
-#: src/prefs_msg_colors.c:279
+#: src/prefs_msg_colors.c:254
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Pick colour for 1st level text background"
 
-#: src/prefs_msg_colors.c:300
+#: src/prefs_msg_colors.c:267
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Pick colour for 2nd level text background"
 
-#: src/prefs_msg_colors.c:321
+#: src/prefs_msg_colors.c:280
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Pick colour for 3rd level text background"
 
-#: src/prefs_msg_colors.c:341
+#: src/prefs_msg_colors.c:292
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Pick colour for links"
 
-#: src/prefs_msg_colors.c:343
+#: src/prefs_msg_colors.c:296
 msgid "URI link"
 msgstr ""
 
-#: src/prefs_msg_colors.c:360
+#: src/prefs_msg_colors.c:304
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Pick colour for signatures"
 
-#: src/prefs_msg_colors.c:367 src/prefs_summaries.c:357
+#: src/prefs_msg_colors.c:311 src/prefs_summaries.c:376
 msgid "Folder list"
 msgstr ""
 
-#: src/prefs_msg_colors.c:380
+#: src/prefs_msg_colors.c:318
+msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"Pick colour for Target folder. Target folder is used when the option "
-"'Execute immediately when moving or deleting messages' is turned off"
+"Pick colour for Target folder. Target folder is used when the option 'Execute "
+"immediately when moving or deleting messages' is turned off"
 
-#: src/prefs_msg_colors.c:384
+#: src/prefs_msg_colors.c:323
 msgid "Target folder"
 msgstr ""
 
-#: src/prefs_msg_colors.c:399
+#: src/prefs_msg_colors.c:330
+msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
 msgstr "Pick colour for folders containing new messages"
 
-#: src/prefs_msg_colors.c:401
+#: src/prefs_msg_colors.c:334
 msgid "Folder containing new messages"
 msgstr ""
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:459
+#: src/prefs_msg_colors.c:359 src/prefs_msg_colors.c:391
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -15329,218 +15667,224 @@ msgstr "Pick colour for 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:463
+#: src/prefs_msg_colors.c:363 src/prefs_msg_colors.c:395
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr ""
 
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:592
-#, c-format
-msgctxt "Dialog title"
-msgid "Pick color for 'color %d'"
-msgstr "Pick colour for 'color %d'"
-
-#: src/prefs_msg_colors.c:600
+#: src/prefs_msg_colors.c:490
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Pick colour for 1st level text"
 
-#: src/prefs_msg_colors.c:603
+#: src/prefs_msg_colors.c:492
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Pick colour for 2nd level text"
 
-#: src/prefs_msg_colors.c:606
+#: src/prefs_msg_colors.c:494
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Pick colour for 3rd level text"
 
-#: src/prefs_msg_colors.c:609
+#: src/prefs_msg_colors.c:496
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Pick colour for 1st level text background"
 
-#: src/prefs_msg_colors.c:612
+#: src/prefs_msg_colors.c:498
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Pick colour for 2nd level text background"
 
-#: src/prefs_msg_colors.c:615
+#: src/prefs_msg_colors.c:500
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Pick colour for 3rd level text background"
 
-#: src/prefs_msg_colors.c:618
+#: src/prefs_msg_colors.c:502
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Pick colour for links"
 
-#: src/prefs_msg_colors.c:621
+#: src/prefs_msg_colors.c:504
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Pick colour for target folder"
 
-#: src/prefs_msg_colors.c:624
+#: src/prefs_msg_colors.c:506
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Pick colour for signatures"
 
-#: src/prefs_msg_colors.c:627
+#: src/prefs_msg_colors.c:508
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 
-#: src/prefs_msg_colors.c:840
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:531
+#, c-format
+msgctxt "Dialog title"
+msgid "Pick color for 'color %d'"
+msgstr "Pick colour for 'color %d'"
+
+#: src/prefs_msg_colors.c:732
 msgid "Colors"
 msgstr "Colours"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:108
 msgid "Choose preset keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:122
 msgid "Select preset:"
 msgstr ""
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:137
 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:496
+#: src/prefs_other.c:494
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:497
 msgid "On exit"
 msgstr ""
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:500
 msgid "Confirm on exit"
 msgstr ""
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:507
 msgid "Empty trash on exit"
 msgstr "Empty wastebin on exit"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:510
 msgid "Warn if there are queued messages"
 msgstr ""
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:512
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:515
 msgid "Enable customisable keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:518
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
 "Uncheck this option if you want to lock all existing keyboard shortcuts."
 msgstr ""
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:525
 msgid " Choose preset keyboard shortcuts... "
 msgstr ""
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:535
 msgid "Metadata handling"
 msgstr ""
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:536
 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:542
+#: src/prefs_other.c:540
 msgid "Safer"
 msgstr ""
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:542
 msgid "Faster"
 msgstr ""
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:560
 msgid "Socket I/O timeout"
 msgstr ""
 
-#: src/prefs_other.c:584
+#: src/prefs_other.c:581
+msgid "Translate header names"
+msgstr ""
+
+#: src/prefs_other.c:583
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+
+#: src/prefs_other.c:586
 msgid "Ask before emptying trash"
 msgstr "Ask before emptying wastebin"
 
-#: src/prefs_other.c:586
+#: src/prefs_other.c:588
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 
-#: src/prefs_other.c:591
+#: src/prefs_other.c:593
 msgid "Use secure file deletion if possible"
 msgstr ""
 
-#: src/prefs_other.c:595
+#: src/prefs_other.c:597
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
 msgstr ""
 
-#: src/prefs_other.c:600
+#: src/prefs_other.c:602
 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:604
+#: src/prefs_other.c:606
 msgid "Synchronise offline folders as soon as possible"
 msgstr ""
 
-#: src/prefs_other.c:607
+#: src/prefs_other.c:609
 msgid "Master passphrase"
 msgstr ""
 
-#: src/prefs_other.c:610
+#: src/prefs_other.c:612
 msgid "Use a master passphrase"
 msgstr ""
 
-#: src/prefs_other.c:613
+#: src/prefs_other.c:615
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
 msgstr ""
 
-#: src/prefs_other.c:618
+#: src/prefs_other.c:620
 msgid "Change master passphrase"
 msgstr ""
 
-#: src/prefs_other.c:778
+#: src/prefs_other.c:785
 msgid "Miscellaneous"
 msgstr ""
 
+#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+msgid "Mail Handling"
+msgstr ""
+
 #: src/prefs_quote.c:77
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr ""
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:145
 msgid "External incorporation program"
 msgstr ""
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:148
 msgid "Use external program for receiving mail"
 msgstr ""
 
-#: src/prefs_receive.c:161
-msgid "Automatic checking"
-msgstr ""
-
-#: src/prefs_receive.c:168
-msgid "Check for new mail every"
-msgstr ""
-
 #: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr ""
@@ -15589,467 +15933,495 @@ msgstr ""
 msgid "after manual check"
 msgstr ""
 
-#: src/prefs_receive.c:268
+#: src/prefs_receive.c:280
 #, c-format
-msgid ""
-"Command to execute:\n"
-"(use %d as number of new mails)"
-msgstr ""
-
-#: src/prefs_receive.c:411 src/prefs_send.c:371
-msgid "Mail Handling"
+msgid "Use %d as number of new mails"
 msgstr ""
 
-#: src/prefs_receive.c:412
+#: src/prefs_receive.c:416
 msgid "Receiving"
 msgstr ""
 
-#: src/prefs_send.c:159
+#: src/prefs_send.c:176
 msgid "Save sent messages"
 msgstr ""
 
-#: src/prefs_send.c:162
+#: src/prefs_send.c:179
 msgid "Never send Return Receipts"
 msgstr ""
 
-#: src/prefs_send.c:180
+#: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
 msgstr ""
 
-#: src/prefs_send.c:183
+#: src/prefs_send.c:200
 msgid "Show send dialog"
 msgstr "Show send dialogue"
 
-#: src/prefs_send.c:186
+#: src/prefs_send.c:203
 msgid "Warn when Subject is empty"
 msgstr ""
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:209
+msgid "Warn when sending to more recipients than"
+msgstr ""
+
+#: src/prefs_send.c:225
 msgid "Outgoing encoding"
 msgstr ""
 
-#: src/prefs_send.c:218
+#: src/prefs_send.c:250
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
 
-#: src/prefs_send.c:235
+#: src/prefs_send.c:267
 msgid "7bit ASCII (US-ASCII)"
 msgstr ""
 
-#: src/prefs_send.c:236
+#: src/prefs_send.c:268
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_send.c:238
+#: src/prefs_send.c:270
 msgid "Western European (ISO-8859-1)"
 msgstr ""
 
-#: src/prefs_send.c:239
+#: src/prefs_send.c:271
 msgid "Western European (ISO-8859-15)"
 msgstr ""
 
-#: src/prefs_send.c:241
+#: src/prefs_send.c:273
 msgid "Central European (ISO-8859-2)"
 msgstr ""
 
-#: src/prefs_send.c:243
+#: src/prefs_send.c:275
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: src/prefs_send.c:244
+#: src/prefs_send.c:276
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:278
 msgid "Greek (ISO-8859-7)"
 msgstr ""
 
-#: src/prefs_send.c:248
+#: src/prefs_send.c:280
 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 
-#: src/prefs_send.c:249
+#: src/prefs_send.c:281
 msgid "Hebrew (Windows-1255)"
 msgstr ""
 
-#: src/prefs_send.c:251
+#: src/prefs_send.c:283
 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 
-#: src/prefs_send.c:252
+#: src/prefs_send.c:284
 msgid "Arabic (Windows-1256)"
 msgstr ""
 
-#: src/prefs_send.c:254
+#: src/prefs_send.c:286
 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 
-#: src/prefs_send.c:256
+#: src/prefs_send.c:288
 msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
-#: src/prefs_send.c:257
+#: src/prefs_send.c:289
 msgid "Cyrillic (KOI8-R)"
 msgstr ""
 
-#: src/prefs_send.c:258
+#: src/prefs_send.c:290
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr ""
 
-#: src/prefs_send.c:259
+#: src/prefs_send.c:291
 msgid "Cyrillic (KOI8-U)"
 msgstr ""
 
-#: src/prefs_send.c:260
+#: src/prefs_send.c:292
 msgid "Cyrillic (Windows-1251)"
 msgstr ""
 
-#: src/prefs_send.c:262
+#: src/prefs_send.c:294
 msgid "Japanese (ISO-2022-JP)"
 msgstr ""
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:296
 msgid "Japanese (EUC-JP)"
 msgstr ""
 
-#: src/prefs_send.c:265
+#: src/prefs_send.c:297
 msgid "Japanese (Shift_JIS)"
 msgstr ""
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:300
 msgid "Simplified Chinese (GB18030)"
 msgstr ""
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:301
 msgid "Simplified Chinese (GB2312)"
 msgstr ""
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:302
 msgid "Simplified Chinese (GBK)"
 msgstr ""
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:303
 msgid "Traditional Chinese (Big5)"
 msgstr ""
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:305
 msgid "Traditional Chinese (EUC-TW)"
 msgstr ""
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:306
 msgid "Chinese (ISO-2022-CN)"
 msgstr ""
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:309
 msgid "Korean (EUC-KR)"
 msgstr ""
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:311
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:312
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:316
 msgid "Transfer encoding"
 msgstr ""
 
-#: src/prefs_send.c:295
+#: src/prefs_send.c:327
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
 
-#: src/prefs_send.c:372 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
+#: src/send_message.c:529
 msgid "Sending"
 msgstr ""
 
-#: src/prefs_spelling.c:81
+#: src/prefs_spelling.c:80
 msgid "Pick color for misspelled word"
 msgstr "Pick colour for misspelled word"
 
-#: src/prefs_spelling.c:129
+#: src/prefs_spelling.c:128
 msgid "Enable spell checker"
 msgstr ""
 
-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:133
 msgid "Enable alternate dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:139
+#: src/prefs_spelling.c:138
 msgid "Faster switching with last used dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:141
+#: src/prefs_spelling.c:140
 msgid "Automatic spell checking"
 msgstr ""
 
-#: src/prefs_spelling.c:149
+#: src/prefs_spelling.c:148
 msgid "Re-check message when changing dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:153
+#: src/prefs_spelling.c:152
 msgid "Dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:190
+#: src/prefs_spelling.c:187
 msgid "Check with both dictionaries"
 msgstr ""
 
-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194
 msgid "Get more dictionaries..."
 msgstr ""
 
-#: src/prefs_spelling.c:207
+#: src/prefs_spelling.c:204
 msgid "Misspelled word color"
 msgstr "Misspelled word colour:"
 
-#: src/prefs_spelling.c:220
+#: src/prefs_spelling.c:216
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Pick colour for misspelled word. Use black to underline"
 
-#: src/prefs_spelling.c:337
+#: src/prefs_spelling.c:333
 msgid "Spell Checking"
 msgstr ""
 
-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:165
 msgid "the abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:166
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:167
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:168
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:169
 msgid "the preferred date and time for the current locale"
 msgstr ""
 
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:170
 msgid "the century number (year/100)"
 msgstr ""
 
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:171
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:172
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:173
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:174
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:175
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:176
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:177
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:178
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:179
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:180
 msgid "the preferred date for the current locale"
 msgstr ""
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:181
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:182
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:183
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_summaries.c:192 src/prefs_summaries.c:240
-#: src/prefs_summaries.c:561
+#: src/prefs_summaries.c:204 src/prefs_summaries.c:252
+#: src/prefs_summaries.c:523
 msgid "Date format"
 msgstr ""
 
-#: src/prefs_summaries.c:216
+#: src/prefs_summaries.c:228
 msgid "Specifier"
 msgstr ""
 
-#: src/prefs_summaries.c:258
+#: src/prefs_summaries.c:270
 msgid "Example"
 msgstr ""
 
-#: src/prefs_summaries.c:363
+#: src/prefs_summaries.c:396
 msgid "Display message count next to folder name"
 msgstr ""
 
-#: src/prefs_summaries.c:373
+#: src/prefs_summaries.c:406
 msgid "Unread messages"
 msgstr ""
 
-#: src/prefs_summaries.c:374
+#: src/prefs_summaries.c:407
 msgid "Unread and Total messages"
 msgstr ""
 
-#: src/prefs_summaries.c:384
+#: src/prefs_summaries.c:413
 msgid "Open last opened folder at start-up"
 msgstr ""
 
-#: src/prefs_summaries.c:387
+#: src/prefs_summaries.c:420
 msgid "Abbreviate newsgroup names longer than"
 msgstr ""
 
-#: src/prefs_summaries.c:401
+#: src/prefs_summaries.c:433
 msgid "letters"
 msgstr ""
 
-#: src/prefs_summaries.c:419
+#: src/prefs_summaries.c:441
 msgid "Message list"
 msgstr ""
 
-#: src/prefs_summaries.c:425
-msgid "Sort new folders by"
-msgstr ""
-
-#: src/prefs_summaries.c:433 src/prefs_summary_column.c:86
-msgid "Number"
-msgstr ""
-
-#: src/prefs_summaries.c:436
-msgid "Thread date"
-msgstr ""
-
-#: src/prefs_summaries.c:447
-msgid "Don't sort"
+#: src/prefs_summaries.c:458
+msgid "Open message when selected"
 msgstr ""
 
-#: src/prefs_summaries.c:464
-msgid "Set default selection when entering a folder"
+#: src/prefs_summaries.c:463
+msgid "When opening a folder"
 msgstr ""
 
-#: src/prefs_summaries.c:477
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Show \"no unread (or new) message\" dialogue"
-
-#: src/prefs_summaries.c:487
-msgid "Assume 'Yes'"
+#: src/prefs_summaries.c:465
+msgid "When displaying search results"
 msgstr ""
 
-#: src/prefs_summaries.c:488
-msgid "Assume 'No'"
+#: src/prefs_summaries.c:467
+msgid "When selecting next or previous message using shortcuts"
 msgstr ""
 
-#: src/prefs_summaries.c:496
-msgid "Open message when selected"
+#: src/prefs_summaries.c:469
+msgid "When deleting or moving messages"
 msgstr ""
 
-#: src/prefs_summaries.c:506
-msgid "When message view is visible"
+#: src/prefs_summaries.c:471
+msgid "When using directional keys"
 msgstr ""
 
-#: src/prefs_summaries.c:512
+#: src/prefs_summaries.c:475
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 
-#: src/prefs_summaries.c:516
+#: src/prefs_summaries.c:479
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_summaries.c:518
+#: src/prefs_summaries.c:481
 msgid ""
 "Defers moving, copying and deleting of messages until you choose 'Tools/"
 "Execute'"
 msgstr ""
 
-#: src/prefs_summaries.c:521
+#: src/prefs_summaries.c:484
 msgid "Mark message as read"
 msgstr ""
 
-#: src/prefs_summaries.c:524
+#: src/prefs_summaries.c:487
 msgid "when selected, after"
 msgstr ""
 
-#: src/prefs_summaries.c:544
+#: src/prefs_summaries.c:506
 msgid "only when opened in a new window, or replied to"
 msgstr ""
 
-#: src/prefs_summaries.c:551
+#: src/prefs_summaries.c:513
 msgid "Display sender using address book"
 msgstr ""
 
-#: src/prefs_summaries.c:555
+#: src/prefs_summaries.c:517
 msgid "Show tooltips"
 msgstr ""
 
-#: src/prefs_summaries.c:581
+#: src/prefs_summaries.c:542
 msgid "Date format help"
 msgstr ""
 
+#: src/prefs_summaries.c:549
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "Show \"no unread (or new) message\" dialogue"
+
+#: src/prefs_summaries.c:559
+msgid "Assume 'Yes'"
+msgstr ""
+
+#: src/prefs_summaries.c:560
+msgid "Assume 'No'"
+msgstr ""
+
+#: src/prefs_summaries.c:566
+msgid "Confirm when marking all messages as read or unread"
+msgstr ""
+
+#: src/prefs_summaries.c:569
+msgid "Confirm when changing color labels"
+msgstr "Confirm when changing colour labels"
+
+#: src/prefs_summaries.c:579 src/quote_fmt.c:539
+msgid "Defaults"
+msgstr ""
+
+#: src/prefs_summaries.c:585
+msgid "Set selection when entering a folder"
+msgstr ""
+
+#: src/prefs_summaries.c:593
+msgid "New folders"
+msgstr ""
+
 #: src/prefs_summaries.c:599
-msgid "Confirm before marking all messages in a folder as read"
+msgid "Sort by"
 msgstr ""
 
-#: src/prefs_summaries.c:602
-msgid "Translate header names"
+#: src/prefs_summaries.c:607 src/prefs_summary_column.c:85
+msgid "Number"
 msgstr ""
 
-#: src/prefs_summaries.c:604
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
+#: src/prefs_summaries.c:610
+msgid "Thread date"
+msgstr ""
+
+#: src/prefs_summaries.c:621
+msgid "Don't sort"
+msgstr ""
+
+#: src/prefs_summaries.c:636
+msgid "Enable threads"
+msgstr ""
+
+#: src/prefs_summaries.c:639
+msgid "Collapse threads"
+msgstr ""
+
+#: src/prefs_summaries.c:645
+msgid "Hide read messages"
 msgstr ""
 
-#: src/prefs_summaries.c:732
+#: src/prefs_summaries.c:821
 msgid "Summaries"
 msgstr ""
 
-#: src/prefs_summary_column.c:226
+#: src/prefs_summary_column.c:225
 msgid "Message list columns configuration"
 msgstr ""
 
-#: src/prefs_summary_column.c:243
+#: src/prefs_summary_column.c:242
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
 
 #: src/prefs_summary_open.c:109
-msgid "first marked email"
+msgid "oldest marked email"
 msgstr ""
 
 #: src/prefs_summary_open.c:110
-msgid "first new email"
+msgid "oldest new email"
 msgstr ""
 
 #: src/prefs_summary_open.c:111
-msgid "first unread email"
+msgid "oldest unread email"
 msgstr ""
 
 #: src/prefs_summary_open.c:112
@@ -16057,22 +16429,34 @@ msgid "last opened email"
 msgstr ""
 
 #: src/prefs_summary_open.c:113
-msgid "last email in the list"
+msgid "newest email in the list"
 msgstr ""
 
 #: src/prefs_summary_open.c:115
-msgid "first email in the list"
+msgid "oldest email in the list"
+msgstr ""
+
+#: src/prefs_summary_open.c:116
+msgid "newest marked email"
+msgstr ""
+
+#: src/prefs_summary_open.c:117
+msgid "newest new email"
+msgstr ""
+
+#: src/prefs_summary_open.c:118
+msgid "newest unread email"
 msgstr ""
 
-#: src/prefs_summary_open.c:184
+#: src/prefs_summary_open.c:188
 msgid " Selection when entering a folder"
 msgstr ""
 
-#: src/prefs_summary_open.c:230
+#: src/prefs_summary_open.c:233
 msgid "Possible selections"
 msgstr ""
 
-#: src/prefs_summary_open.c:266
+#: src/prefs_summary_open.c:268
 msgid "Selection on folder opening"
 msgstr ""
 
@@ -16086,168 +16470,164 @@ msgid ""
 "account."
 msgstr ""
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:308
 msgid "Append the new template above to the list"
 msgstr ""
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:317
 msgid "Replace the selected template in list with the template above"
 msgstr ""
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:327
 msgid "Delete the selected template from the list"
 msgstr ""
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:345
 msgid "Show information on configuring templates"
 msgstr ""
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:369
 msgid "Move the selected template to the top"
 msgstr ""
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:379
 msgid "Move the selected template up"
 msgstr ""
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:387
 msgid "Move the selected template down"
 msgstr ""
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:397
 msgid "Move the selected template to the bottom"
 msgstr ""
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:413
 msgid "Template configuration"
 msgstr ""
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:601
 msgid "Templates list not saved"
 msgstr ""
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:602
 msgid "The templates list has been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_template.c:768
+#: src/prefs_template.c:759
 msgid "The template's name is not set."
 msgstr ""
 
-#: src/prefs_template.c:811
+#: src/prefs_template.c:802
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:817
+#: src/prefs_template.c:808
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:823
+#: src/prefs_template.c:814
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:829
+#: src/prefs_template.c:820
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:835
+#: src/prefs_template.c:826
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:841
+#: src/prefs_template.c:832
 msgid "The \"Subject\" field of the template is invalid."
 msgstr ""
 
-#: src/prefs_template.c:912
+#: src/prefs_template.c:903
 msgid "Delete template"
 msgstr ""
 
-#: src/prefs_template.c:913
+#: src/prefs_template.c:904
 msgid "Do you really want to delete this template?"
 msgstr ""
 
-#: src/prefs_template.c:925
+#: src/prefs_template.c:916
 msgid "Delete all templates"
 msgstr ""
 
-#: src/prefs_template.c:926
+#: src/prefs_template.c:917
 msgid "Do you really want to delete all the templates?"
 msgstr ""
 
-#: src/prefs_template.c:1241
+#: src/prefs_template.c:1233
 msgid "Current templates"
 msgstr ""
 
-#: src/prefs_template.c:1269
+#: src/prefs_template.c:1261
 msgid "Template"
 msgstr ""
 
-#: src/prefs_themes.c:344 src/prefs_themes.c:704
+#: src/prefs_themes.c:401 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr ""
 
-#: src/prefs_themes.c:366
+#: src/prefs_themes.c:423
 msgid "Themes"
 msgstr ""
 
-#: src/prefs_themes.c:436
-msgid "Only root can remove system themes"
-msgstr ""
-
-#: src/prefs_themes.c:439
+#: src/prefs_themes.c:500
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:442
+#: src/prefs_themes.c:502
 #, c-format
 msgid "Remove theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:448
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr ""
 
-#: src/prefs_themes.c:458
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
 "while removing theme."
 msgstr ""
 
-#: src/prefs_themes.c:462
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr ""
 
-#: src/prefs_themes.c:465
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr ""
 
-#: src/prefs_themes.c:485
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr ""
 
-#: src/prefs_themes.c:500
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr ""
 
-#: src/prefs_themes.c:503
+#: src/prefs_themes.c:562
 msgid ""
-"This folder doesn't seem to be a theme folder.\n"
+"This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 
-#: src/prefs_themes.c:510
+#: src/prefs_themes.c:572
 msgid "Do you want to install theme for all users?"
 msgstr ""
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:592
 msgid "Theme exists"
 msgstr ""
 
-#: src/prefs_themes.c:531
+#: src/prefs_themes.c:593
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -16255,157 +16635,173 @@ msgid ""
 "Do you want to replace it?"
 msgstr ""
 
-#: src/prefs_themes.c:537
+#: src/prefs_themes.c:600
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr ""
 
-#: src/prefs_themes.c:545
+#: src/prefs_themes.c:609
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr ""
 
-#: src/prefs_themes.c:558
+#: src/prefs_themes.c:623
 msgid "Theme installed successfully."
 msgstr ""
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:630
 msgid "Failed installing theme"
 msgstr ""
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:633
 #, c-format
 msgid ""
 "File %s failed\n"
 "while installing theme."
 msgstr ""
 
-#: src/prefs_themes.c:666
+#: src/prefs_themes.c:803
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 
-#: src/prefs_themes.c:707
+#: src/prefs_themes.c:844
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr ""
 
-#: src/prefs_themes.c:713
+#: src/prefs_themes.c:850
 msgid "No info file available for this theme"
 msgstr ""
 
-#: src/prefs_themes.c:731
+#: src/prefs_themes.c:868
 msgid "Error: couldn't get theme status"
 msgstr ""
 
-#: src/prefs_themes.c:755
+#: src/prefs_themes.c:898
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr ""
 
-#: src/prefs_themes.c:803
+#: src/prefs_themes.c:956
 msgid "Selector"
 msgstr ""
 
-#: src/prefs_themes.c:814
+#: src/prefs_themes.c:967
 msgid "Install new..."
 msgstr ""
 
-#: src/prefs_themes.c:819
+#: src/prefs_themes.c:972
 msgid "Get more..."
 msgstr ""
 
-#: src/prefs_themes.c:830
+#: src/prefs_themes.c:983
 msgid "Information"
 msgstr ""
 
-#: src/prefs_themes.c:844
-msgid "Author: "
+#: src/prefs_themes.c:998
+msgid "Author"
 msgstr ""
 
-#: src/prefs_themes.c:852
-msgid "URL:"
+#: src/prefs_themes.c:1006
+msgid "URL"
 msgstr ""
 
-#: src/prefs_themes.c:894
+#: src/prefs_themes.c:1048
 msgid "Preview"
 msgstr ""
 
-#: src/prefs_toolbar.c:176
+#: src/prefs_themes.c:1105
+msgid "SVG rendering"
+msgstr ""
+
+#: src/prefs_themes.c:1112
+msgid "Enable alpha channel"
+msgstr ""
+
+#: src/prefs_themes.c:1113
+msgid "Force scaling"
+msgstr ""
+
+#: src/prefs_themes.c:1119
+msgid "Pixels per inch (PPI)"
+msgstr ""
+
+#: src/prefs_toolbar.c:186
 msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
 msgstr ""
 
-#: src/prefs_toolbar.c:177
+#: src/prefs_toolbar.c:187
 msgid "Item has no icon defined."
 msgstr ""
 
-#: src/prefs_toolbar.c:178
+#: src/prefs_toolbar.c:188
 msgid "Item has no text defined."
 msgstr ""
 
-#: src/prefs_toolbar.c:916
+#: src/prefs_toolbar.c:896
 msgid "Toolbar item"
 msgstr ""
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:912
 msgid "Item type"
 msgstr ""
 
-#: src/prefs_toolbar.c:942
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr ""
 
-#: src/prefs_toolbar.c:943
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr ""
 
-#: src/prefs_toolbar.c:945 src/toolbar.c:234
+#: src/prefs_toolbar.c:925 src/toolbar.c:279
 msgid "Separator"
 msgstr ""
 
-#: src/prefs_toolbar.c:952
+#: src/prefs_toolbar.c:932
 msgid "Event executed on click"
 msgstr ""
 
-#: src/prefs_toolbar.c:991
+#: src/prefs_toolbar.c:959
 msgid "Toolbar text"
 msgstr ""
 
-#: src/prefs_toolbar.c:1006 src/prefs_toolbar.c:1382
+#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
 msgid "Icon"
 msgstr ""
 
-#: src/prefs_toolbar.c:1042
+#: src/prefs_toolbar.c:1010
 msgid "A_dd"
 msgstr ""
 
-#: src/prefs_toolbar.c:1262 src/prefs_toolbar.c:1276 src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
 msgid "Toolbars"
 msgstr ""
 
-#: src/prefs_toolbar.c:1263
+#: src/prefs_toolbar.c:1231
 msgid "Main Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1277
+#: src/prefs_toolbar.c:1245
 msgid "Message Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1291
+#: src/prefs_toolbar.c:1259
 msgid "Compose Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1405
+#: src/prefs_toolbar.c:1374
 msgid "Icon text"
 msgstr ""
 
-#: src/prefs_toolbar.c:1414
+#: src/prefs_toolbar.c:1383
 msgid "Mapped event"
 msgstr ""
 
-#: src/prefs_toolbar.c:1711
+#: src/prefs_toolbar.c:1690
 msgid "Toolbar item icon"
 msgstr ""
 
@@ -16429,39 +16825,39 @@ msgstr ""
 msgid "Wrap text at"
 msgstr ""
 
-#: src/prefs_wrapping.c:154
+#: src/prefs_wrapping.c:153
 msgid "Wrapping"
 msgstr ""
 
-#: src/printing.c:436
+#: src/printing.c:430
 msgid "Print preview"
 msgstr ""
 
-#: src/printing.c:479
+#: src/printing.c:473
 msgid "First page"
 msgstr ""
 
-#: src/printing.c:490
+#: src/printing.c:483
 msgid "Last page"
 msgstr ""
 
-#: src/printing.c:496
+#: src/printing.c:489
 msgid "Zoom 100%"
 msgstr ""
 
-#: src/printing.c:498
+#: src/printing.c:491
 msgid "Zoom fit"
 msgstr ""
 
-#: src/printing.c:500
+#: src/printing.c:493
 msgid "Zoom in"
 msgstr ""
 
-#: src/printing.c:502
+#: src/printing.c:495
 msgid "Zoom out"
 msgstr ""
 
-#: src/printing.c:701
+#: src/printing.c:675
 #, c-format
 msgid "Page %d"
 msgstr ""
@@ -16474,53 +16870,53 @@ msgstr ""
 msgid "No recipient keys defined."
 msgstr ""
 
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: src/procmime.c:401 src/procmime.c:403 src/procmime.c:404
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
-#: src/procmsg.c:936 src/procmsg.c:939
+#: src/procmsg.c:935 src/procmsg.c:938
 msgid "Already trying to send."
 msgstr ""
 
-#: src/procmsg.c:1557 src/procmsg.c:1616
+#: src/procmsg.c:1562 src/procmsg.c:1623
 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 
-#: src/procmsg.c:1626
+#: src/procmsg.c:1633
 msgid "Queued message header is broken."
 msgstr ""
 
-#: src/procmsg.c:1646
+#: src/procmsg.c:1653
 msgid "An error happened during SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1660
+#: src/procmsg.c:1667
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 
-#: src/procmsg.c:1668
+#: src/procmsg.c:1675
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 
-#: src/procmsg.c:1690
+#: src/procmsg.c:1698
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1703
+#: src/procmsg.c:1711
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 
-#: src/procmsg.c:1717
+#: src/procmsg.c:1725
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 
-#: src/procmsg.c:2269
+#: src/procmsg.c:2285
 msgid "Filtering messages...\n"
 msgstr ""
 
@@ -16696,23 +17092,31 @@ msgid ""
 "to attach"
 msgstr ""
 
-#: src/quote_fmt.c:97
-msgid "<span weight=\"bold\">definition of terms:</span>"
+#: src/quote_fmt.c:96
+msgid ""
+"attach file:\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
+"get\n"
+"the filename from"
 msgstr ""
 
 #: src/quote_fmt.c:98
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr ""
+
+#: src/quote_fmt.c:99
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
 msgstr ""
 
-#: src/quote_fmt.c:99
+#: src/quote_fmt.c:100
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
 msgstr ""
 
-#: src/quote_fmt.c:100
+#: src/quote_fmt.c:101
 msgid ""
 "completion from address book only works with the first\n"
 "address of the header, it outputs the full name\n"
@@ -16720,15 +17124,15 @@ msgid ""
 "one contact in the address book"
 msgstr ""
 
-#: src/quote_fmt.c:109
+#: src/quote_fmt.c:110
 msgid "Description of symbols"
 msgstr ""
 
-#: src/quote_fmt.c:110
+#: src/quote_fmt.c:111
 msgid "The following symbols and commands can be used:"
 msgstr ""
 
-#: src/quote_fmt.c:173
+#: src/quote_fmt.c:174
 msgid "Use template when composing new messages"
 msgstr ""
 
@@ -16738,139 +17142,135 @@ msgid ""
 "new message."
 msgstr ""
 
-#: src/quote_fmt.c:299
+#: src/quote_fmt.c:297
 msgid "Use template when replying to messages"
 msgstr ""
 
-#: src/quote_fmt.c:323
+#: src/quote_fmt.c:320
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr ""
 
-#: src/quote_fmt.c:334 src/quote_fmt.c:464
+#: src/quote_fmt.c:331 src/quote_fmt.c:459
 msgid "Quotation mark"
 msgstr ""
 
-#: src/quote_fmt.c:429
+#: src/quote_fmt.c:425
 msgid "Use template when forwarding messages"
 msgstr ""
 
-#: src/quote_fmt.c:453
+#: src/quote_fmt.c:448
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr ""
 
-#: src/quote_fmt.c:545
-msgid "Defaults"
-msgstr ""
-
-#: src/quote_fmt.c:563
+#: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/quote_fmt.c:566
+#: src/quote_fmt.c:560
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr ""
 
-#: src/quote_fmt.c:583
+#: src/quote_fmt.c:577
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr ""
 
-#: src/quote_fmt.c:603
+#: src/quote_fmt.c:597
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr ""
 
-#: src/quote_fmt_parse.y:541
+#: src/quote_fmt_parse.y:544
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr ""
 
-#: src/quote_fmt_parse.y:542
+#: src/quote_fmt_parse.y:545
 msgid "Enter variable"
 msgstr ""
 
-#: src/send_message.c:153
+#: src/send_message.c:154
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr ""
 
-#: src/send_message.c:167
+#: src/send_message.c:168
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr ""
 
-#: src/send_message.c:202
+#: src/send_message.c:204
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr ""
 
-#: src/send_message.c:350
+#: src/send_message.c:353
 msgid "Connecting"
 msgstr ""
 
-#: src/send_message.c:355
+#: src/send_message.c:358
 msgid "Doing POP before SMTP..."
 msgstr ""
 
-#: src/send_message.c:358
+#: src/send_message.c:361
 msgid "POP before SMTP"
 msgstr ""
 
-#: src/send_message.c:363
+#: src/send_message.c:366
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr ""
 
-#: src/send_message.c:420
+#: src/send_message.c:439
 msgid "Mail sent successfully."
 msgstr ""
 
-#: src/send_message.c:486
+#: src/send_message.c:505
 msgid "Sending HELO..."
 msgstr ""
 
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
 msgid "Authenticating"
 msgstr ""
 
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:507 src/send_message.c:512
 msgid "Sending message..."
 msgstr ""
 
-#: src/send_message.c:491
+#: src/send_message.c:510
 msgid "Sending EHLO..."
 msgstr ""
 
-#: src/send_message.c:500
+#: src/send_message.c:519
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:504
+#: src/send_message.c:523
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:509
+#: src/send_message.c:528
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:513
+#: src/send_message.c:532
 msgid "Quitting..."
 msgstr ""
 
-#: src/send_message.c:542
+#: src/send_message.c:561
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr ""
 
-#: src/send_message.c:595
+#: src/send_message.c:614
 msgid "Sending message"
 msgstr ""
 
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:683 src/send_message.c:703
 msgid "Error occurred while sending the message."
 msgstr ""
 
-#: src/send_message.c:667
+#: src/send_message.c:686
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -16889,440 +17289,471 @@ msgid ""
 "If you're not sure, just select OK."
 msgstr ""
 
-#: src/sourcewindow.c:64
+#: src/sourcewindow.c:65
 msgid "Source of the message"
 msgstr ""
 
-#: src/sourcewindow.c:159
+#: src/sourcewindow.c:160
 #, c-format
 msgid "%s - Source"
 msgstr ""
 
-#: src/ssl_manager.c:156
-msgid "Saved SSL certificates"
+#: src/ssl_manager.c:131
+msgid "Expiry"
+msgstr ""
+
+#: src/ssl_manager.c:183
+msgid "Saved SSL/TLS certificates"
 msgstr ""
 
-#: src/ssl_manager.c:436
+#: src/ssl_manager.c:463
 msgid "Delete certificate"
 msgstr ""
 
-#: src/ssl_manager.c:437
+#: src/ssl_manager.c:464
 msgid "Do you really want to delete this certificate?"
 msgstr ""
 
-#: src/summary_search.c:259
+#: src/summary_search.c:290
 msgid "Search messages"
 msgstr ""
 
-#: src/summary_search.c:281
+#: src/summary_search.c:312
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:283
+#: src/summary_search.c:314
 msgid "Match all of the following"
 msgstr ""
 
-#: src/summary_search.c:447
+#: src/summary_search.c:435
 msgid "Body:"
 msgstr ""
 
-#: src/summary_search.c:454
+#: src/summary_search.c:442
 msgid "Condition:"
 msgstr ""
 
-#: src/summary_search.c:484
+#: src/summary_search.c:476
 msgid "Find _all"
 msgstr ""
 
-#: src/summary_search.c:690 src/summaryview.c:1086 src/summaryview.c:1347
+#: src/summary_search.c:691 src/summaryview.c:1102 src/summaryview.c:1365
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
 
-#: src/summary_search.c:787
+#: src/summary_search.c:786
 msgid "Beginning of list reached; continue from end?"
 msgstr ""
 
-#: src/summary_search.c:789
+#: src/summary_search.c:788
 msgid "End of list reached; continue from beginning?"
 msgstr ""
 
-#: src/summaryview.c:429
+#: src/summaryview.c:440
 msgid "Create _filter rule"
 msgstr ""
 
-#: src/summaryview.c:557
+#: src/summaryview.c:568
 msgid "Toggle quick search bar"
 msgstr ""
 
-#: src/summaryview.c:594
+#: src/summaryview.c:605
 msgid "Toggle multiple selection"
 msgstr ""
 
-#: src/summaryview.c:1275
+#: src/summaryview.c:1293
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:1276
+#: src/summaryview.c:1294
 msgid "Some marks are left. Process them?"
 msgstr ""
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1344
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 
-#: src/summaryview.c:1823 src/summaryview.c:1875
+#: src/summaryview.c:1924 src/summaryview.c:1972
 msgid "No more unread messages"
 msgstr ""
 
-#: src/summaryview.c:1824
+#: src/summaryview.c:1925
 msgid "No unread message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1836 src/summaryview.c:1888 src/summaryview.c:1931
-#: src/summaryview.c:1983 src/summaryview.c:2062
+#: src/summaryview.c:1937 src/summaryview.c:1985 src/summaryview.c:2022
+#: src/summaryview.c:2070 src/summaryview.c:2137
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
-#: src/summaryview.c:1844
+#: src/summaryview.c:1949
 msgid "No unread messages."
 msgstr ""
 
-#: src/summaryview.c:1876
+#: src/summaryview.c:1973
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:1918 src/summaryview.c:1970
+#: src/summaryview.c:2009 src/summaryview.c:2057
 msgid "No more new messages"
 msgstr ""
 
-#: src/summaryview.c:1919
+#: src/summaryview.c:2010
 msgid "No new message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:2034
 msgid "No new messages."
 msgstr ""
 
-#: src/summaryview.c:1971
+#: src/summaryview.c:2058
 msgid "No new message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2008 src/summaryview.c:2049
+#: src/summaryview.c:2091 src/summaryview.c:2124
 msgid "No more marked messages"
 msgstr ""
 
-#: src/summaryview.c:2009
+#: src/summaryview.c:2092
 msgid "No marked message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2018
+#: src/summaryview.c:2101
 msgid "No marked messages."
 msgstr ""
 
-#: src/summaryview.c:2050
+#: src/summaryview.c:2125
 msgid "No marked message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2087 src/summaryview.c:2112
+#: src/summaryview.c:2158 src/summaryview.c:2187
 msgid "No more labeled messages"
 msgstr "No more labelled messages"
 
-#: src/summaryview.c:2088
+#: src/summaryview.c:2159
 msgid "No labeled message found. Search from the end?"
 msgstr "No labelled message found. Search from the end?"
 
-#: src/summaryview.c:2097 src/summaryview.c:2122
+#: src/summaryview.c:2168 src/summaryview.c:2201
 msgid "No labeled messages."
 msgstr "No labelled messages."
 
-#: src/summaryview.c:2113
+#: src/summaryview.c:2188
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No labelled message found. Search from the beginning?"
 
-#: src/summaryview.c:2427
+#: src/summaryview.c:2506
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2612
+#: src/summaryview.c:2691
 #, c-format
 msgid "%d deleted"
 msgstr ""
 
-#: src/summaryview.c:2616
+#: src/summaryview.c:2695
 #, c-format
 msgid "%s%d moved"
 msgstr ""
 
-#: src/summaryview.c:2617 src/summaryview.c:2624
+#: src/summaryview.c:2696 src/summaryview.c:2703
 msgid ", "
 msgstr ""
 
-#: src/summaryview.c:2622
+#: src/summaryview.c:2701
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2636
+#: src/summaryview.c:2715
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:2654 src/summaryview.c:2697
+#: src/summaryview.c:2733 src/summaryview.c:2776
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr ""
 
-#: src/summaryview.c:2672
+#: src/summaryview.c:2751
 msgid "Message summary"
 msgstr ""
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2752
 msgid "New:"
 msgstr ""
 
-#: src/summaryview.c:2674
+#: src/summaryview.c:2753
 msgid "Unread:"
 msgstr ""
 
-#: src/summaryview.c:2675
+#: src/summaryview.c:2754
 msgid "Total:"
 msgstr ""
 
-#: src/summaryview.c:2677
+#: src/summaryview.c:2756
 msgid "Marked:"
 msgstr ""
 
-#: src/summaryview.c:2678
+#: src/summaryview.c:2757
 msgid "Replied:"
 msgstr ""
 
-#: src/summaryview.c:2679
+#: src/summaryview.c:2758
 msgid "Forwarded:"
 msgstr ""
 
-#: src/summaryview.c:2680
+#: src/summaryview.c:2759
 msgid "Locked:"
 msgstr ""
 
-#: src/summaryview.c:2681
+#: src/summaryview.c:2760
 msgid "Ignored:"
 msgstr ""
 
-#: src/summaryview.c:2682
+#: src/summaryview.c:2761
 msgid "Watched:"
 msgstr ""
 
-#: src/summaryview.c:2692
+#: src/summaryview.c:2771
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr ""
 
-#: src/summaryview.c:2972
+#: src/summaryview.c:3064
 msgid "Sorting summary..."
 msgstr ""
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3232
 msgid "Setting summary from message data..."
 msgstr ""
 
-#: src/summaryview.c:3316
+#: src/summaryview.c:3438
 msgid "(No Date)"
 msgstr ""
 
-#: src/summaryview.c:3368
+#: src/summaryview.c:3495
 msgid "(No Recipient)"
 msgstr ""
 
-#: src/summaryview.c:3403
+#: src/summaryview.c:3543
 #, c-format
 msgid "From: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:3412
+#: src/summaryview.c:3552
 #, c-format
 msgid "To: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:4291
-msgid "You're not the author of the article.\n"
+#: src/summaryview.c:4441
+msgid "You're not the author of the article."
 msgstr ""
 
-#: src/summaryview.c:4381
+#: src/summaryview.c:4531
 #, 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:4384
-#, fuzzy
+#: src/summaryview.c:4534
 msgid "Delete message"
 msgid_plural "Delete messages"
-msgstr[0] "Next la_belled message"
-msgstr[1] "Next la_belled message"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/summaryview.c:4548
+#: src/summaryview.c:4698
 msgid "Destination is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4653
+#: src/summaryview.c:4753
+msgid "Select folder to move selected message to"
+msgid_plural "Select folder to move selected messages to"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/summaryview.c:4804
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4818
+#: src/summaryview.c:4838
+msgid "Select folder to copy selected message to"
+msgid_plural "Select folder to copy selected messages to"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/summaryview.c:4989
 msgid "Append or Overwrite"
 msgstr ""
 
-#: src/summaryview.c:4819
+#: src/summaryview.c:4990
 msgid "Append or overwrite existing file?"
 msgstr ""
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4991
 msgid "_Append"
 msgstr ""
 
-#: src/summaryview.c:4820
+#: src/summaryview.c:4991
 msgid "_Overwrite"
 msgstr ""
 
-#: src/summaryview.c:4861
+#: src/summaryview.c:5032
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/summaryview.c:5321
+#: src/summaryview.c:5490
 msgid "Building threads..."
 msgstr ""
 
-#: src/summaryview.c:5569
+#: src/summaryview.c:5738
 msgid "Skip these rules"
 msgstr ""
 
-#: src/summaryview.c:5572
+#: src/summaryview.c:5741
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
-#: src/summaryview.c:5575
+#: src/summaryview.c:5744
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
-#: src/summaryview.c:5604
+#: src/summaryview.c:5773
 msgid "Filtering"
 msgstr ""
 
-#: src/summaryview.c:5605
+#: src/summaryview.c:5774
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
-#: src/summaryview.c:5635
+#: src/summaryview.c:5805
 msgid "Filtering..."
 msgstr ""
 
-#: src/summaryview.c:5714
+#: src/summaryview.c:5884
 msgid "Processing configuration"
 msgstr ""
 
-#: src/summaryview.c:6260
+#: src/summaryview.c:6032
+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:6034
+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:6035
+msgid "Reset color label"
+msgstr "Reset colour label"
+
+#: src/summaryview.c:6035
+msgid "Set color label"
+msgstr "Set colour label"
+
+#: src/summaryview.c:6478
 msgid "Ignored thread"
 msgstr ""
 
-#: src/summaryview.c:6262
+#: src/summaryview.c:6480
 msgid "Watched thread"
 msgstr ""
 
-#: src/summaryview.c:6270
+#: src/summaryview.c:6488
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6272
+#: src/summaryview.c:6490
 msgid "Replied - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6284
+#: src/summaryview.c:6502
 msgid "To be moved"
 msgstr ""
 
-#: src/summaryview.c:6286
+#: src/summaryview.c:6504
 msgid "To be copied"
 msgstr ""
 
-#: src/summaryview.c:6298
+#: src/summaryview.c:6516
 msgid "Signed, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6302
+#: src/summaryview.c:6520
 msgid "Encrypted, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6304
+#: src/summaryview.c:6522
 msgid "Encrypted"
 msgstr ""
 
-#: src/summaryview.c:6306
+#: src/summaryview.c:6524
 msgid "Has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:7953
+#: src/summaryview.c:8196
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
-#: src/summaryview.c:8056
+#: src/summaryview.c:8299
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 
-#: src/summaryview.c:8061
+#: src/summaryview.c:8304
 msgid "Go back to the folder list"
 msgstr ""
 
-#: src/textview.c:231
+#: src/textview.c:246
 msgid "_Open in web browser"
 msgstr ""
 
-#: src/textview.c:232
+#: src/textview.c:247
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:239
+#: src/textview.c:254
 msgid "_Reply to this address"
 msgstr ""
 
-#: src/textview.c:240
+#: src/textview.c:255
 msgid "Add to _Address book"
 msgstr ""
 
-#: src/textview.c:241
+#: src/textview.c:256
 msgid "Copy this add_ress"
 msgstr ""
 
-#: src/textview.c:247
+#: src/textview.c:262
 msgid "_Open image"
 msgstr ""
 
-#: src/textview.c:248
+#: src/textview.c:263
 msgid "_Save image..."
 msgstr ""
 
-#: src/textview.c:722
+#: src/textview.c:725
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr ""
 
-#: src/textview.c:725
+#: src/textview.c:728
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr ""
 
-#: src/textview.c:914
+#: src/textview.c:918
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -17331,68 +17762,68 @@ msgid ""
 "  Use "
 msgstr ""
 
-#: src/textview.c:919
+#: src/textview.c:923
 msgid "'Network Log'"
 msgstr ""
 
-#: src/textview.c:920
+#: src/textview.c:924
 msgid " in the Tools menu for more information."
 msgstr ""
 
-#: src/textview.c:983
+#: src/textview.c:990
 msgid "  The following can be performed on this part\n"
 msgstr ""
 
-#: src/textview.c:985
+#: src/textview.c:992
 msgid "  by right-clicking the icon or list item:"
 msgstr ""
 
-#: src/textview.c:989
+#: src/textview.c:996
 msgid "     - To save, select "
 msgstr ""
 
-#: src/textview.c:990
+#: src/textview.c:997
 msgid "'Save as...'"
 msgstr ""
 
-#: src/textview.c:992 src/textview.c:1004 src/textview.c:1016
-#: src/textview.c:1026
+#: src/textview.c:999 src/textview.c:1011 src/textview.c:1023
+#: src/textview.c:1033
 msgid " (Shortcut key: '"
 msgstr ""
 
-#: src/textview.c:1000
+#: src/textview.c:1007
 msgid "     - To display as text, select "
 msgstr ""
 
-#: src/textview.c:1001
+#: src/textview.c:1008
 msgid "'Display as text'"
 msgstr ""
 
-#: src/textview.c:1012
+#: src/textview.c:1019
 msgid "     - To open with an external program, select "
 msgstr ""
 
-#: src/textview.c:1013
+#: src/textview.c:1020
 msgid "'Open'"
 msgstr ""
 
-#: src/textview.c:1021
+#: src/textview.c:1028
 msgid "       (alternately double-click, or click the middle "
 msgstr ""
 
-#: src/textview.c:1022
+#: src/textview.c:1029
 msgid "mouse button)\n"
 msgstr ""
 
-#: src/textview.c:1024
+#: src/textview.c:1031
 msgid "     - Or use "
 msgstr ""
 
-#: src/textview.c:1025
+#: src/textview.c:1032
 msgid "'Open with...'"
 msgstr ""
 
-#: src/textview.c:1139
+#: src/textview.c:1153
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -17400,314 +17831,402 @@ msgid ""
 "Exit code %d\n"
 msgstr ""
 
-#: src/textview.c:2188
+#: src/textview.c:2229
 msgid "Tags: "
 msgstr ""
 
-#: src/textview.c:2894
+#: src/textview.c:2948
 msgid "The real URL is different from the displayed URL."
 msgstr ""
 
-#: src/textview.c:2895
+#: src/textview.c:2949
 msgid "Displayed URL:"
 msgstr ""
 
-#: src/textview.c:2896
+#: src/textview.c:2950
 msgid "Real URL:"
 msgstr ""
 
-#: src/textview.c:2897
+#: src/textview.c:2951
 msgid "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2898
+#: src/textview.c:2952
 msgid "Phishing attempt warning"
 msgstr ""
 
-#: src/textview.c:2899
+#: src/textview.c:2953
 msgid "_Open URL"
 msgstr ""
 
-#: src/toolbar.c:192 src/toolbar.c:1930
+#: src/toolbar.c:224 src/toolbar.c:2294
 msgid "Receive Mail from all Accounts"
 msgstr ""
 
-#: src/toolbar.c:193 src/toolbar.c:1935
+#: src/toolbar.c:225 src/toolbar.c:2299
 msgid "Receive Mail from current Account"
 msgstr ""
 
-#: src/toolbar.c:194 src/toolbar.c:1939
+#: src/toolbar.c:226 src/toolbar.c:2303
 msgid "Send Queued Messages"
 msgstr ""
 
-#: src/toolbar.c:195 src/toolbar.c:905 src/toolbar.c:1957 src/toolbar.c:1968
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
 msgid "Compose Email"
 msgstr ""
 
-#: src/toolbar.c:196
+#: src/toolbar.c:228
 msgid "Compose News"
 msgstr ""
 
-#: src/toolbar.c:197 src/toolbar.c:1996 src/toolbar.c:2006
+#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
 msgid "Reply to Message"
 msgstr ""
 
-#: src/toolbar.c:198 src/toolbar.c:2013 src/toolbar.c:2023
+#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
 msgid "Reply to Sender"
 msgstr ""
 
-#: src/toolbar.c:199 src/toolbar.c:2030 src/toolbar.c:2040
+#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
 msgid "Reply to All"
 msgstr ""
 
-#: src/toolbar.c:200 src/toolbar.c:2047 src/toolbar.c:2057
+#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
 msgid "Reply to Mailing-list"
 msgstr ""
 
-#: src/toolbar.c:201 src/toolbar.c:1951
+#: src/toolbar.c:233 src/toolbar.c:2315
 msgid "Open email"
 msgstr ""
 
-#: src/toolbar.c:202 src/toolbar.c:2064 src/toolbar.c:2075
+#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
 msgid "Forward Message"
 msgstr ""
 
-#: src/toolbar.c:203 src/toolbar.c:2080
+#: src/toolbar.c:235 src/toolbar.c:2460
 msgid "Trash Message"
 msgstr "Move Message to Wastebin"
 
-#: src/toolbar.c:204 src/toolbar.c:2084
+#: src/toolbar.c:236 src/toolbar.c:2464
 msgid "Delete Message"
 msgstr ""
 
-#: src/toolbar.c:206 src/toolbar.c:2092
+#: src/toolbar.c:237
+msgid "Delete duplicate messages"
+msgstr ""
+
+#: src/toolbar.c:239 src/toolbar.c:2472
 msgid "Go to Previous Unread Message"
 msgstr ""
 
-#: src/toolbar.c:207 src/toolbar.c:2096
+#: src/toolbar.c:240 src/toolbar.c:2476
 msgid "Go to Next Unread Message"
 msgstr ""
 
-#: src/toolbar.c:210 src/toolbar.c:421
+#: src/toolbar.c:244
+msgid "Mark Message"
+msgstr ""
+
+#: src/toolbar.c:245
+msgid "Unmark Message"
+msgstr ""
+
+#: src/toolbar.c:246
+msgid "Lock Message"
+msgstr ""
+
+#: src/toolbar.c:247
+msgid "Unlock Message"
+msgstr ""
+
+#: src/toolbar.c:248
+msgid "Mark all Messages as read"
+msgstr ""
+
+#: src/toolbar.c:249
+msgid "Mark all Messages as unread"
+msgstr ""
+
+#: src/toolbar.c:250
+msgid "Mark Message as read"
+msgstr ""
+
+#: src/toolbar.c:251
+msgid "Mark Message as unread"
+msgstr ""
+
+#: src/toolbar.c:253 src/toolbar.c:514
 msgid "Print"
 msgstr ""
 
-#: src/toolbar.c:211
+#: src/toolbar.c:254
 msgid "Learn Spam or Ham"
 msgstr ""
 
-#: src/toolbar.c:212
+#: src/toolbar.c:255
 msgid "Open folder/Go to folder list"
 msgstr ""
 
-#: src/toolbar.c:215 src/toolbar.c:2102
+#: src/toolbar.c:258 src/toolbar.c:2482
 msgid "Send Message"
 msgstr ""
 
-#: src/toolbar.c:216 src/toolbar.c:2106
+#: src/toolbar.c:259 src/toolbar.c:2486
 msgid "Put into queue folder and send later"
 msgstr ""
 
-#: src/toolbar.c:217 src/toolbar.c:2110
+#: src/toolbar.c:260 src/toolbar.c:2490
 msgid "Save to draft folder"
 msgstr ""
 
-#: src/toolbar.c:218 src/toolbar.c:2114
+#: src/toolbar.c:261 src/toolbar.c:2494
 msgid "Insert file"
 msgstr ""
 
-#: src/toolbar.c:219 src/toolbar.c:2118
+#: src/toolbar.c:262 src/toolbar.c:2498
 msgid "Attach file"
 msgstr ""
 
-#: src/toolbar.c:220 src/toolbar.c:2122
+#: src/toolbar.c:263 src/toolbar.c:2502
 msgid "Insert signature"
 msgstr ""
 
-#: src/toolbar.c:221 src/toolbar.c:2126
+#: src/toolbar.c:264 src/toolbar.c:2506
 msgid "Replace signature"
 msgstr ""
 
-#: src/toolbar.c:222 src/toolbar.c:2130
+#: src/toolbar.c:265 src/toolbar.c:2510
 msgid "Edit with external editor"
 msgstr ""
 
-#: src/toolbar.c:223 src/toolbar.c:2134
+#: src/toolbar.c:266 src/toolbar.c:2514
 msgid "Wrap long lines of current paragraph"
 msgstr ""
 
-#: src/toolbar.c:224 src/toolbar.c:2138
+#: src/toolbar.c:267 src/toolbar.c:2518
 msgid "Wrap all long lines"
 msgstr ""
 
-#: src/toolbar.c:227 src/toolbar.c:440 src/toolbar.c:2147
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
 msgid "Check spelling"
 msgstr ""
 
-#: src/toolbar.c:229
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
+msgid "Sign"
+msgstr ""
+
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
+msgid "Encrypt"
+msgstr ""
+
+#: src/toolbar.c:274
 msgid "Claws Mail Actions Feature"
 msgstr ""
 
-#: src/toolbar.c:230 src/toolbar.c:2163
+#: src/toolbar.c:275 src/toolbar.c:2559
 msgid "Cancel receiving"
 msgstr ""
 
-#: src/toolbar.c:232 src/toolbar.c:2171
+#: src/toolbar.c:277 src/toolbar.c:2567
 msgid "Cancel receiving/sending"
 msgstr ""
 
-#: src/toolbar.c:233 src/toolbar.c:1943
+#: src/toolbar.c:278 src/toolbar.c:2307
 msgid "Close window"
 msgstr ""
 
-#: src/toolbar.c:235
+#: src/toolbar.c:280
 msgid "Claws Mail Plugins"
 msgstr ""
 
-#: src/toolbar.c:379 src/toolbar.c:414
+#: src/toolbar.c:445 src/toolbar.c:496
 msgctxt "Toolbar"
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/toolbar.c:402
-msgid "Folders"
-msgstr ""
-
-#: src/toolbar.c:404
+#: src/toolbar.c:485
 msgid "Get Mail"
 msgstr ""
 
-#: src/toolbar.c:405
+#: src/toolbar.c:486
 msgid "Get"
 msgstr ""
 
-#: src/toolbar.c:407 src/toolbar.c:408
+#: src/toolbar.c:488 src/toolbar.c:489
 msgctxt "Toolbar"
 msgid "Compose"
 msgstr ""
 
-#: src/toolbar.c:410
-msgid "All"
-msgstr ""
-
-#: src/toolbar.c:411
+#: src/toolbar.c:491
 msgctxt "Toolbar"
 msgid "Sender"
 msgstr ""
 
-#: src/toolbar.c:412
+#: src/toolbar.c:492
+msgid "All"
+msgstr ""
+
+#: src/toolbar.c:493
 msgid "List"
 msgstr ""
 
-#: src/toolbar.c:417
+#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
+msgid "Delete duplicates"
+msgstr ""
+
+#: src/toolbar.c:500
 msgid "Prev"
 msgstr ""
 
-#: src/toolbar.c:418
+#: src/toolbar.c:501
 msgid "Next"
 msgstr ""
 
-#: src/toolbar.c:426
+#: src/toolbar.c:509
+msgid "All read"
+msgstr ""
+
+#: src/toolbar.c:510
+msgid "All unread"
+msgstr ""
+
+#: src/toolbar.c:511
+msgid "Read"
+msgstr ""
+
+#: src/toolbar.c:516
+msgid "Folders"
+msgstr ""
+
+#: src/toolbar.c:521
 msgid "Draft"
 msgstr ""
 
-#: src/toolbar.c:429
+#: src/toolbar.c:524
 msgid "Insert sig."
 msgstr ""
 
-#: src/toolbar.c:430
+#: src/toolbar.c:525
 msgid "Replace sig."
 msgstr ""
 
-#: src/toolbar.c:431
+#: src/toolbar.c:526
 msgid "Edit"
 msgstr ""
 
-#: src/toolbar.c:432
+#: src/toolbar.c:527
 msgid "Wrap para."
 msgstr ""
 
-#: src/toolbar.c:433
+#: src/toolbar.c:528
 msgid "Wrap all"
 msgstr ""
 
-#: src/toolbar.c:435 src/toolbar.c:436
+#: src/toolbar.c:536 src/toolbar.c:537
 msgid "Stop"
 msgstr ""
 
-#: src/toolbar.c:437
+#: src/toolbar.c:538
 msgid "Stop all"
 msgstr ""
 
-#: src/toolbar.c:897
+#: src/toolbar.c:951
 msgid "Compose News message"
 msgstr ""
 
-#: src/toolbar.c:936
+#: src/toolbar.c:990
 msgid "Learn spam"
 msgstr ""
 
-#: src/toolbar.c:945
+#: src/toolbar.c:999
 msgid "Ham"
 msgstr ""
 
-#: src/toolbar.c:947
+#: src/toolbar.c:1001
 msgid "Learn ham"
 msgstr ""
 
-#: src/toolbar.c:1925
+#: src/toolbar.c:1916
+msgid "Message will be signed"
+msgstr ""
+
+#: src/toolbar.c:1918
+msgid "Message will not be signed"
+msgstr ""
+
+#: src/toolbar.c:1937
+msgid "Message will be encrypted"
+msgstr ""
+
+#: src/toolbar.c:1939
+msgid "Message will not be encrypted"
+msgstr ""
+
+#: src/toolbar.c:2289
 msgid "Go to folder list"
 msgstr ""
 
-#: src/toolbar.c:1931
+#: src/toolbar.c:2295
 msgid "Receive Mail from selected Account"
 msgstr ""
 
-#: src/toolbar.c:1947
+#: src/toolbar.c:2311
 msgid "Open preferences"
 msgstr ""
 
-#: src/toolbar.c:1958
+#: src/toolbar.c:2322
 msgid "Compose with selected Account"
 msgstr ""
 
-#: src/toolbar.c:1979
+#: src/toolbar.c:2343
 msgid "Learn as..."
 msgstr ""
 
-#: src/toolbar.c:1989
+#: src/toolbar.c:2353
 msgid "Learn as _Spam"
 msgstr ""
 
-#: src/toolbar.c:1990
+#: src/toolbar.c:2354
 msgid "Learn as _Ham"
 msgstr ""
 
-#: src/toolbar.c:1997
+#: src/toolbar.c:2361
+msgid "Delete duplicates options"
+msgstr ""
+
+#: src/toolbar.c:2365
+msgid "Delete duplicates in selected folder"
+msgstr ""
+
+#: src/toolbar.c:2366
+msgid "Delete duplicates in all folders"
+msgstr ""
+
+#: src/toolbar.c:2377
 msgid "Reply to Message options"
 msgstr ""
 
-#: src/toolbar.c:2001 src/toolbar.c:2018 src/toolbar.c:2035 src/toolbar.c:2052
+#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
 msgid "_Reply with quote"
 msgstr ""
 
-#: src/toolbar.c:2002 src/toolbar.c:2019 src/toolbar.c:2036 src/toolbar.c:2053
+#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
 msgid "Reply without _quote"
 msgstr ""
 
-#: src/toolbar.c:2014
+#: src/toolbar.c:2394
 msgid "Reply to Sender options"
 msgstr ""
 
-#: src/toolbar.c:2031
+#: src/toolbar.c:2411
 msgid "Reply to All options"
 msgstr ""
 
-#: src/toolbar.c:2048
+#: src/toolbar.c:2428
 msgid "Reply to Mailing-list options"
 msgstr ""
 
-#: src/toolbar.c:2065
+#: src/toolbar.c:2445
 msgid "Forward Message options"
 msgstr ""
 
@@ -17732,12 +18251,12 @@ msgstr ""
 msgid "Select All"
 msgstr ""
 
-#: src/wizard.c:521
+#: src/wizard.c:523
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:544
+#: src/wizard.c:546
 #, c-format
 msgid ""
 "\n"
@@ -17767,7 +18286,7 @@ msgid ""
 "-----------\n"
 "Homepage:      <%s>\n"
 "Manual:        <%s>\n"
-"FAQ:\t       <%s>\n"
+"FAQ:           <%s>\n"
 "Themes:        <%s>\n"
 "Mailing Lists: <%s>\n"
 "\n"
@@ -17775,9 +18294,8 @@ msgid ""
 "-------\n"
 "Claws Mail is free software, released under the terms\n"
 "of the GNU General Public License, version 3 or later, as\n"
-"published by the Free Software Foundation, 51 Franklin Street,\n"
-"Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
-"found at <%s>.\n"
+"published by the Free Software Foundation. The license can\n"
+"be found at <%s>.\n"
 "\n"
 "DONATIONS\n"
 "---------\n"
@@ -17786,131 +18304,127 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/wizard.c:620
+#: src/wizard.c:621
 msgid "Please enter the mailbox name."
 msgstr ""
 
-#: src/wizard.c:648
+#: src/wizard.c:649
 msgid "Please enter your name and email address."
 msgstr ""
 
-#: src/wizard.c:659
+#: src/wizard.c:660
 msgid "Please enter your receiving server and username."
 msgstr ""
 
-#: src/wizard.c:669
+#: src/wizard.c:670
 msgid "Please enter your username."
 msgstr ""
 
-#: src/wizard.c:679
+#: src/wizard.c:680
 msgid "Please enter your SMTP server."
 msgstr ""
 
-#: src/wizard.c:690
+#: src/wizard.c:691
 msgid "Please enter your SMTP username."
 msgstr ""
 
-#: src/wizard.c:975
+#: src/wizard.c:976
 msgid "Your name:"
 msgstr ""
 
-#: src/wizard.c:986
+#: src/wizard.c:987
 msgid "Your email address:"
 msgstr ""
 
-#: src/wizard.c:997
+#: src/wizard.c:998
 msgid "Your organization:"
 msgstr "Your organisation:"
 
-#: src/wizard.c:1031
+#: src/wizard.c:1032
 msgid "Mailbox name:"
 msgstr ""
 
-#: src/wizard.c:1039
+#: src/wizard.c:1040
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 
-#: src/wizard.c:1110
+#: src/wizard.c:1111
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 
-#: src/wizard.c:1113
+#: src/wizard.c:1114
 msgid "SMTP server address:"
 msgstr ""
 
-#: src/wizard.c:1119
-msgid "Use authentication"
-msgstr ""
-
-#: src/wizard.c:1128
+#: src/wizard.c:1129
 msgid "(empty to use the same as receive)"
 msgstr ""
 
-#: src/wizard.c:1142
+#: src/wizard.c:1143
 msgid "SMTP username:"
 msgstr ""
 
-#: src/wizard.c:1153
+#: src/wizard.c:1154
 msgid "SMTP password:"
 msgstr ""
 
-#: src/wizard.c:1166
-msgid "Use SSL to connect to SMTP server"
+#: src/wizard.c:1167
+msgid "Use SSL/TLS to connect to SMTP server"
 msgstr ""
 
-#: src/wizard.c:1177 src/wizard.c:1597
-msgid "Use SSL via STARTTLS"
+#: src/wizard.c:1178 src/wizard.c:1598
+msgid "Use STARTTLS command to start encryption"
 msgstr ""
 
-#: src/wizard.c:1189 src/wizard.c:1609
-msgid "Client SSL certificate (optional)"
+#: src/wizard.c:1190 src/wizard.c:1610
+msgid "Client SSL/TLS certificate (optional)"
 msgstr ""
 
-#: src/wizard.c:1257 src/wizard.c:1289 src/wizard.c:1544
+#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
 msgid "Server address:"
 msgstr ""
 
-#: src/wizard.c:1321
+#: src/wizard.c:1322
 msgid "Local mailbox:"
 msgstr ""
 
-#: src/wizard.c:1490
+#: src/wizard.c:1491
 msgid "Server type:"
 msgstr ""
 
 #: src/wizard.c:1500
-msgid "IMAP"
+msgid "POP3"
 msgstr ""
 
-#: src/wizard.c:1555
+#: src/wizard.c:1556
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 
-#: src/wizard.c:1586
-msgid "Use SSL to connect to receiving server"
+#: src/wizard.c:1587
+msgid "Use SSL/TLS to connect to receiving server"
 msgstr ""
 
-#: src/wizard.c:1651
+#: src/wizard.c:1652
 msgid "IMAP server directory:"
 msgstr ""
 
-#: src/wizard.c:1662
+#: src/wizard.c:1663
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: src/wizard.c:1670
+#: src/wizard.c:1671
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
 msgstr ""
 
-#: src/wizard.c:1788
+#: src/wizard.c:1789
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list