[Commits] [SCM] claws branch, master, updated. 3.17.8-93-g3b445aecb

paul at claws-mail.org paul at claws-mail.org
Thu Jul 8 10:56:47 CEST 2021


The branch, master has been updated
       via  3b445aecb380e3eeb9ea437e9017d43c836e3142 (commit)
      from  980fdc6919639136e728dda266a8389c188bb328 (commit)

Summary of changes:
 po/en_GB.po | 2641 +++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1470 insertions(+), 1171 deletions(-)


- Log -----------------------------------------------------------------
commit 3b445aecb380e3eeb9ea437e9017d43c836e3142
Author: Paul <paul at claws-mail.org>
Date:   Thu Jul 8 09:56:42 2021 +0100

    update en_GB translation

diff --git a/po/en_GB.po b/po/en_GB.po
index 318619567..2cef806ac 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.17.5\n"
+"Project-Id-Version: Claws Mail 3.18.0\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2020-02-17 12:21+0000\n"
-"PO-Revision-Date: 2008-09-28 08:00+0000\n"
+"POT-Creation-Date: 2021-07-08 09:55+0100\n"
+"PO-Revision-Date: 2021-07-08 09:43+0100\n"
 "Last-Translator: Paul Mangan <paul at claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul at claws-mail.org>\n"
 "Language: en_GB\n"
@@ -53,48 +53,48 @@ msgstr ""
 msgid "Copy of %s"
 msgstr ""
 
-#: src/account.c:1119
+#: src/account.c:1126
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
-#: src/account.c:1121
+#: src/account.c:1128
 msgid "(Untitled)"
 msgstr ""
 
-#: src/account.c:1122
+#: src/account.c:1129
 msgid "Delete account"
 msgstr ""
 
-#: src/account.c:1596
+#: src/account.c:1603
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1602
+#: src/account.c:1609
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
+#: src/account.c:1616 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7491 src/editaddress.c:1474
 #: src/editaddress.c:1503 src/editaddress.c:1519
 #: src/editaddress_other_attributes_ldap.c:371
 #: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
 #: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
 #: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: src/plugins/pdf_viewer/poppler_viewer.c:1851
 #: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
 #: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
 #: src/prefs_themes.c:990
 msgid "Name"
 msgstr ""
 
-#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1624 src/prefs_account.c:1271 src/prefs_account.c:5012
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1632 src/ssl_manager.c:109
 msgid "Server"
 msgstr ""
 
@@ -138,7 +138,8 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: src/action.c:999 src/compose.c:5280 src/compose.c:5285 src/compose.c:9706
+#: src/compose.c:9745 src/ldaputil.c:333
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -202,7 +203,7 @@ msgstr ""
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addr_compl.c:689 src/addressbook.c:5018
+#: src/addr_compl.c:699 src/addressbook.c:5009
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr ""
@@ -273,8 +274,8 @@ msgid ""
 "with the default set?"
 msgstr ""
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
+#: src/addrcustomattr.c:217 src/addressbook.c:437 src/addressbook.c:462
+#: src/addressbook.c:479 src/edittags.c:286
 #: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
 #: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
@@ -343,11 +344,11 @@ msgstr ""
 msgid "Address book path"
 msgstr ""
 
-#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
+#: src/addrduplicates.c:791 src/addressbook.c:1436 src/addressbook.c:1489
 msgid "Delete address(es)"
 msgstr ""
 
-#: src/addrduplicates.c:792 src/addressbook.c:1499
+#: src/addrduplicates.c:792 src/addressbook.c:1490
 msgid "Really delete the address(es)?"
 msgstr ""
 
@@ -355,7 +356,7 @@ msgstr ""
 msgid "Delete address"
 msgstr ""
 
-#: src/addrduplicates.c:842 src/addressbook.c:1446
+#: src/addrduplicates.c:842 src/addressbook.c:1437
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 
@@ -376,7 +377,7 @@ msgstr ""
 msgid "Select Address Book Folder"
 msgstr ""
 
-#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
+#: src/addressadd.c:599 src/addressbook.c:3259 src/addressbook.c:3310
 msgid "Add address(es)"
 msgstr ""
 
@@ -384,7 +385,7 @@ msgstr ""
 msgid "Can't add the specified address"
 msgstr ""
 
-#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
+#: src/addressbook.c:129 src/addressbook.c:4997 src/editaddress.c:1247
 #: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
 #: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
@@ -394,136 +395,126 @@ msgstr ""
 msgid "_Book"
 msgstr ""
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
+#: src/addressbook.c:478 src/compose.c:615 src/mainwindow.c:523
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr ""
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:620 src/mainwindow.c:526
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr ""
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
-#: src/messageview.c:216
-msgid "_Help"
-msgstr ""
-
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:464
 msgid "New _Book"
 msgstr ""
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:465
 msgid "New _Folder"
 msgstr ""
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr ""
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr ""
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
 msgstr ""
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr ""
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr ""
 
-#: src/addressbook.c:427 src/compose.c:624
+#: src/addressbook.c:426 src/compose.c:632
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
 #: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
+#: src/addressbook.c:427 src/compose.c:636 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
 #: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr ""
 
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
 msgid "_Select all"
 msgstr ""
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
 msgid "C_ut"
 msgstr ""
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
+#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
+#: src/compose.c:644 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr ""
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:645 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr ""
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:481
 msgid "New _Address"
 msgstr ""
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
 msgid "New _Group"
 msgstr ""
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:488
 msgid "_Mail To"
 msgstr ""
 
-#: src/addressbook.c:444 src/addressbook.c:497
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Merge"
 msgstr ""
 
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr ""
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr ""
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr ""
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr ""
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr ""
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr ""
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
-#: src/messageview.c:340
-msgid "_About"
-msgstr ""
-
-#: src/addressbook.c:495
+#: src/addressbook.c:490
 msgid "_Browse Entry"
 msgstr ""
 
-#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
 #: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
@@ -531,269 +522,269 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
 msgid "Success"
 msgstr ""
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:122
 msgid "Bad arguments"
 msgstr ""
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:123
 msgid "File not specified"
 msgstr ""
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:124
 msgid "Error opening file"
 msgstr ""
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:125
 msgid "Error reading file"
 msgstr ""
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:126
 msgid "End of file encountered"
 msgstr ""
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr ""
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:128
 msgid "Bad file format"
 msgstr ""
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:129
 msgid "Error writing to file"
 msgstr ""
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:130
 msgid "Error opening directory"
 msgstr ""
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:131
 msgid "No path specified"
 msgstr ""
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr ""
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr ""
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr ""
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr ""
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr ""
 
-#: src/addressbook.c:544
+#: src/addressbook.c:539
 msgid "Error starting STARTTLS connection"
 msgstr ""
 
-#: src/addressbook.c:545
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
 msgstr ""
 
-#: src/addressbook.c:546
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr ""
 
-#: src/addressbook.c:547
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr ""
 
-#: src/addressbook.c:548
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr ""
 
-#: src/addressbook.c:916
+#: src/addressbook.c:911
 msgid "Sources"
 msgstr ""
 
-#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/addressbook.c:915 src/prefs_matcher.c:643 src/prefs_other.c:493
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr ""
 
-#: src/addressbook.c:1118 src/editldap.c:794
+#: src/addressbook.c:1109 src/editldap.c:794
 msgid "Search"
 msgstr ""
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1481
 msgid "Delete group"
 msgstr ""
 
-#: src/addressbook.c:1491
+#: src/addressbook.c:1482
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2209
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 
-#: src/addressbook.c:2228
+#: src/addressbook.c:2219
 msgid "Cannot paste into an address group."
 msgstr ""
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2956
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 
-#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
+#: src/addressbook.c:2959 src/addressbook.c:2985 src/addressbook.c:2992
 #: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr ""
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2968
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
 
-#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/addressbook.c:2971 src/imap_gtk.c:368 src/mh_gtk.c:206
 #: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr ""
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete _folder only"
 msgstr ""
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2972
 msgid "Delete folder and _addresses"
 msgstr ""
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2983
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:2990
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
-#: src/addressbook.c:3113
+#: src/addressbook.c:3104
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
-#: src/addressbook.c:3251 src/addressbook.c:3300
+#: src/addressbook.c:3242 src/addressbook.c:3291
 msgid "New Contacts"
 msgstr ""
 
-#: src/addressbook.c:4137
+#: src/addressbook.c:4128
 msgid "New user, could not save index file."
 msgstr ""
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4132
 msgid "New user, could not save address book files."
 msgstr ""
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4142
 msgid "Old address book converted successfully."
 msgstr ""
 
-#: src/addressbook.c:4156
+#: src/addressbook.c:4147
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4169
+#: src/addressbook.c:4160
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4166
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4180
+#: src/addressbook.c:4171
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:4187 src/addressbook.c:4193
+#: src/addressbook.c:4178 src/addressbook.c:4184
 msgid "Addressbook conversion error"
 msgstr ""
 
-#: src/addressbook.c:4308
+#: src/addressbook.c:4299
 msgid "Addressbook Error"
 msgstr ""
 
-#: src/addressbook.c:4309
+#: src/addressbook.c:4300
 msgid "Could not read address index"
 msgstr ""
 
-#: src/addressbook.c:4640
+#: src/addressbook.c:4631
 msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:4970 src/prefs_send.c:220
+#: src/addressbook.c:4961 src/prefs_send.c:220
 msgid "Interface"
 msgstr ""
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4973
 msgid "Address Books"
 msgstr ""
 
-#: src/addressbook.c:4994
+#: src/addressbook.c:4985
 msgid "Person"
 msgstr ""
 
-#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
+#: src/addressbook.c:5021 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3468 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr ""
 
-#: src/addressbook.c:5042
+#: src/addressbook.c:5033
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:5054 src/addressbook.c:5066
+#: src/addressbook.c:5045 src/addressbook.c:5057
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5069
 msgid "LDAP servers"
 msgstr ""
 
-#: src/addressbook.c:5090
+#: src/addressbook.c:5081
 msgid "LDAP Query"
 msgstr ""
 
@@ -900,18 +891,18 @@ msgstr ""
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
-#: src/alertpanel.c:144 src/compose.c:9795
+#: src/alertpanel.c:144 src/compose.c:9820
 msgid "Notice"
 msgstr ""
 
-#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
-#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
+#: src/alertpanel.c:157 src/compose.c:5874 src/compose.c:6419
+#: src/compose.c:12221 src/file_checker.c:83 src/file_checker.c:107
 #: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5091
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5095
 msgid "Warning"
 msgstr ""
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5811 src/inc.c:731
 #: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr ""
@@ -1024,36 +1015,36 @@ msgstr ""
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
-#: src/common/session.c:201 src/imap.c:1233
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr ""
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr ""
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr ""
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr ""
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr ""
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr ""
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr ""
 
@@ -1190,636 +1181,644 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr ""
 
-#: src/common/utils.c:4029
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr ""
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr ""
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr ""
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr ""
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr ""
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr ""
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr ""
 
-#: src/common/utils.c:4037
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr ""
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr ""
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr ""
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr ""
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr ""
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr ""
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr ""
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr ""
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr ""
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr ""
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr ""
 
-#: src/common/utils.c:4050
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr ""
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr ""
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr ""
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr ""
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr ""
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr ""
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr ""
 
-#: src/common/utils.c:4058
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr ""
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr ""
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr ""
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr ""
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr ""
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr ""
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr ""
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr ""
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr ""
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr ""
 
-#: src/common/utils.c:4079
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr ""
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr ""
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr ""
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr ""
 
-#: src/compose.c:596
+#: src/compose.c:198
+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:604
 msgid "_Add..."
 msgstr ""
 
-#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/compose.c:605 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
 #: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr ""
 
-#: src/compose.c:599 src/folderview.c:254
+#: src/compose.c:607 src/folderview.c:254
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:614 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr ""
 
-#: src/compose.c:609
+#: src/compose.c:617
 msgid "_Spelling"
 msgstr ""
 
-#: src/compose.c:611 src/compose.c:678
+#: src/compose.c:619 src/compose.c:686
 msgid "_Options"
 msgstr ""
 
-#: src/compose.c:615
+#: src/compose.c:621 src/mainwindow.c:528 src/messageview.c:216
+msgid "_Help"
+msgstr ""
+
+#: src/compose.c:623
 msgid "S_end"
 msgstr ""
 
-#: src/compose.c:616
+#: src/compose.c:624
 msgid "Send _later"
 msgstr ""
 
-#: src/compose.c:619
+#: src/compose.c:627
 msgid "_Attach file"
 msgstr ""
 
-#: src/compose.c:620
+#: src/compose.c:628
 msgid "_Insert file"
 msgstr ""
 
-#: src/compose.c:621
+#: src/compose.c:629
 msgid "Insert si_gnature"
 msgstr ""
 
-#: src/compose.c:622
+#: src/compose.c:630
 msgid "_Replace signature"
 msgstr ""
 
-#: src/compose.c:626
+#: src/compose.c:634
 msgid "_Print"
 msgstr ""
 
-#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:639 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr ""
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr ""
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:643 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr ""
 
-#: src/compose.c:639
+#: src/compose.c:647
 msgid "_Special paste"
 msgstr ""
 
-#: src/compose.c:640
+#: src/compose.c:648
 msgid "As _quotation"
 msgstr ""
 
-#: src/compose.c:641
+#: src/compose.c:649
 msgid "_Wrapped"
 msgstr ""
 
-#: src/compose.c:642
+#: src/compose.c:650
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:644 src/mainwindow.c:558
+#: src/compose.c:652 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
 
-#: src/compose.c:646
+#: src/compose.c:654
 msgid "A_dvanced"
 msgstr ""
 
-#: src/compose.c:647
+#: src/compose.c:655
 msgid "Move a character backward"
 msgstr ""
 
-#: src/compose.c:648
+#: src/compose.c:656
 msgid "Move a character forward"
 msgstr ""
 
-#: src/compose.c:649
+#: src/compose.c:657
 msgid "Move a word backward"
 msgstr ""
 
-#: src/compose.c:650
+#: src/compose.c:658
 msgid "Move a word forward"
 msgstr ""
 
-#: src/compose.c:651
+#: src/compose.c:659
 msgid "Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:652
+#: src/compose.c:660
 msgid "Move to end of line"
 msgstr ""
 
-#: src/compose.c:653
+#: src/compose.c:661
 msgid "Move to previous line"
 msgstr ""
 
-#: src/compose.c:654
+#: src/compose.c:662
 msgid "Move to next line"
 msgstr ""
 
-#: src/compose.c:655
+#: src/compose.c:663
 msgid "Delete a character backward"
 msgstr ""
 
-#: src/compose.c:656
+#: src/compose.c:664
 msgid "Delete a character forward"
 msgstr ""
 
-#: src/compose.c:657
+#: src/compose.c:665
 msgid "Delete a word backward"
 msgstr ""
 
-#: src/compose.c:658
+#: src/compose.c:666
 msgid "Delete a word forward"
 msgstr ""
 
-#: src/compose.c:659
+#: src/compose.c:667
 msgid "Delete line"
 msgstr ""
 
-#: src/compose.c:660
+#: src/compose.c:668
 msgid "Delete to end of line"
 msgstr ""
 
-#: src/compose.c:663 src/messageview.c:231
+#: src/compose.c:671 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr ""
 
-#: src/compose.c:666
+#: src/compose.c:674
 msgid "_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:667
+#: src/compose.c:675
 msgid "Wrap all long _lines"
 msgstr ""
 
-#: src/compose.c:669
+#: src/compose.c:677
 msgid "Edit with e_xternal editor"
 msgstr ""
 
-#: src/compose.c:672
+#: src/compose.c:680
 msgid "_Check all or check selection"
 msgstr ""
 
-#: src/compose.c:673
+#: src/compose.c:681
 msgid "_Highlight all misspelled words"
 msgstr ""
 
-#: src/compose.c:674
+#: src/compose.c:682
 msgid "Check _backwards misspelled word"
 msgstr ""
 
-#: src/compose.c:675
+#: src/compose.c:683
 msgid "_Forward to next misspelled word"
 msgstr ""
 
-#: src/compose.c:682
+#: src/compose.c:690
 msgid "Reply _mode"
 msgstr ""
 
-#: src/compose.c:684
+#: src/compose.c:692
 msgid "Privacy _System"
 msgstr ""
 
-#: src/compose.c:688
+#: src/compose.c:696
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:698 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr ""
 
-#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:703 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr ""
 
-#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:704 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr ""
 
-#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:705 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr ""
 
-#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:706 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr ""
 
-#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:707 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr ""
 
-#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:708 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr ""
 
-#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:709 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr ""
 
-#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:710 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr ""
 
-#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:711 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr ""
 
-#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:714 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr ""
 
-#: src/compose.c:708
+#: src/compose.c:716
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:718 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr ""
 
-#: src/compose.c:719
+#: src/compose.c:722 src/mainwindow.c:825 src/messageview.c:340
+msgid "_About"
+msgstr ""
+
+#: src/compose.c:727
 msgid "Aut_o wrapping"
 msgstr ""
 
-#: src/compose.c:720
+#: src/compose.c:728
 msgid "Auto _indent"
 msgstr ""
 
-#: src/compose.c:721
+#: src/compose.c:729
 msgid "Si_gn"
 msgstr ""
 
-#: src/compose.c:722
+#: src/compose.c:730
 msgid "_Encrypt"
 msgstr ""
 
-#: src/compose.c:723
+#: src/compose.c:731
 msgid "_Request Return Receipt"
 msgstr ""
 
-#: src/compose.c:724
+#: src/compose.c:732
 msgid "Remo_ve references"
 msgstr ""
 
-#: src/compose.c:725
+#: src/compose.c:733
 msgid "Show _ruler"
 msgstr ""
 
-#: src/compose.c:730 src/compose.c:740
+#: src/compose.c:738 src/compose.c:748
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/compose.c:739 src/mainwindow.c:674 src/messageview.c:305
 #: src/summaryview.c:433
 msgid "_All"
 msgstr ""
 
-#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/compose.c:740 src/mainwindow.c:675 src/messageview.c:306
 #: src/summaryview.c:434
 msgid "_Sender"
 msgstr ""
 
-#: src/compose.c:733
+#: src/compose.c:741
 msgid "_Mailing-list"
 msgstr ""
 
-#: src/compose.c:738
+#: src/compose.c:746
 msgid "_Highest"
 msgstr ""
 
-#: src/compose.c:739
+#: src/compose.c:747
 msgid "Hi_gh"
 msgstr ""
 
-#: src/compose.c:741
+#: src/compose.c:749
 msgid "Lo_w"
 msgstr ""
 
-#: src/compose.c:742
+#: src/compose.c:750
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:755 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr ""
 
-#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:756 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr ""
 
-#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:757 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr ""
 
-#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:761 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr ""
 
-#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:764 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr ""
 
-#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:769 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr ""
 
-#: src/compose.c:1015 src/compose.c:1697
-msgid ""
-"You have opted to sign and/or encrypt this message but have not selected a "
-"privacy system.\n"
-"\n"
-"Signing and encrypting have been disabled for this message."
-msgstr ""
-
-#: src/compose.c:1051
+#: src/compose.c:1056
 msgid "New message From format error."
 msgstr ""
 
-#: src/compose.c:1144
+#: src/compose.c:1149
 msgid "New message subject format error."
 msgstr ""
 
-#: src/compose.c:1176 src/quote_fmt.c:563
+#: src/compose.c:1181 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:1445
+#: src/compose.c:1450
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 
-#: src/compose.c:1630 src/quote_fmt.c:580
+#: src/compose.c:1635 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1679 src/quote_fmt.c:583
+#: src/compose.c:1684 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:2016 src/quote_fmt.c:600
+#: src/compose.c:1825 src/compose.c:2026 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1883 src/quote_fmt.c:603
+#: src/compose.c:1886 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2059
+#: src/compose.c:2069
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2566
+#: src/compose.c:2580
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2633 src/gtk/headers.h:14
+#: src/compose.c:2651 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2636 src/gtk/headers.h:15
+#: src/compose.c:2654 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2639 src/gtk/headers.h:12
+#: src/compose.c:2657 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
+#: src/compose.c:2660 src/compose.c:5029 src/compose.c:5031
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2645 src/gtk/headers.h:34
+#: src/compose.c:2663 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2648 src/gtk/headers.h:17
+#: src/compose.c:2666 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
+#: src/compose.c:2670 src/compose.c:5026 src/compose.c:5034
 #: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr ""
 
-#: src/compose.c:2842
+#: src/compose.c:2860
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2848
+#: src/compose.c:2866
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1830,131 +1829,131 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3128
+#: src/compose.c:3146
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3657
+#: src/compose.c:3675
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3675
+#: src/compose.c:3693
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
 
-#: src/compose.c:3678
+#: src/compose.c:3696
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
+#: src/compose.c:3697 src/compose.c:10809 src/compose.c:11701
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3804
+#: src/compose.c:3822
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3805
+#: src/compose.c:3823
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3806
+#: src/compose.c:3824
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3815
+#: src/compose.c:3833
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3842
+#: src/compose.c:3860
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4870 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4877 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4880 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4882 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4891 src/messageview.c:887
+#: src/compose.c:4909 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:5108 src/compose.c:5145
+#: src/compose.c:5126 src/compose.c:5163
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
-#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5128 src/compose.c:5165 src/compose.c:5203 src/compose.c:5246
+#: src/prefs_account.c:4122 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr ""
 
-#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
-#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/compose.c:5130 src/compose.c:5167 src/compose.c:5204 src/compose.c:5247
+#: src/compose.c:5812 src/folderview.c:2546 src/messageview.c:859
 #: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr ""
 
-#: src/compose.c:5166
+#: src/compose.c:5184
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5181
+#: src/compose.c:5199
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5182 src/compose.c:5225
+#: src/compose.c:5200 src/compose.c:5243
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5183 src/compose.c:5226
+#: src/compose.c:5201 src/compose.c:5244
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
+#: src/compose.c:5203 src/compose.c:5246 src/toolbar.c:520
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5204 src/compose.c:5247
 msgid "_Queue"
 msgstr ""
 
-#: src/compose.c:5224
+#: src/compose.c:5242
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr ""
 
-#: src/compose.c:5253
+#: src/compose.c:5271
 msgid "Could not queue message."
 msgstr ""
 
-#: src/compose.c:5256
+#: src/compose.c:5274
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -1962,7 +1961,7 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:5260
+#: src/compose.c:5278
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1970,7 +1969,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5265
+#: src/compose.c:5283
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1978,34 +1977,34 @@ msgid ""
 "Encryption failed: %s"
 msgstr ""
 
-#: src/compose.c:5270
+#: src/compose.c:5288
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5274
+#: src/compose.c:5292
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
-#: src/compose.c:5337 src/compose.c:5397
+#: src/compose.c:5355 src/compose.c:5415
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5393
+#: src/compose.c:5411
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5790
+#: src/compose.c:5808
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2013,7 +2012,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5852
+#: src/compose.c:5870
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2022,260 +2021,280 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:6087
+#: src/compose.c:6105
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:6088
+#: src/compose.c:6106
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:6137
+#: src/compose.c:6155
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:6146
+#: src/compose.c:6164
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6400
+#: src/compose.c:6418
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6420 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr ""
 
-#: src/compose.c:6402
+#: src/compose.c:6420
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6458
+#: src/compose.c:6476
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:7058
+#: src/compose.c:7076
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:7225
+#: src/compose.c:7243
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7247 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
-#: src/compose.c:7461
+#: src/compose.c:7479
 msgid "Mime type"
 msgstr ""
 
-#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: src/compose.c:7485 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
 #: src/prefs_matcher.c:641 src/prefs_summaries.c:633
 #: src/prefs_summary_column.c:84 src/summaryview.c:472
 msgid "Size"
 msgstr ""
 
-#: src/compose.c:7529
+#: src/compose.c:7547
 msgid "Save Message to "
 msgstr ""
 
-#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
+#: src/compose.c:7578 src/editjpilot.c:276 src/editldap.c:518
 #: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
 #: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:434
+#: src/plugins/spamassassin/spamassassin_gtk.c:437
 msgid "_Browse"
 msgstr ""
 
-#: src/compose.c:7576
+#: src/compose.c:7594
 msgid "Select folder to save message to"
 msgstr ""
 
-#: src/compose.c:8033
+#: src/compose.c:8051
 msgid "Hea_der"
 msgstr ""
 
-#: src/compose.c:8038
+#: src/compose.c:8056
 msgid "_Attachments"
 msgstr ""
 
-#: src/compose.c:8052
+#: src/compose.c:8070
 msgid "Othe_rs"
 msgstr ""
 
-#: src/compose.c:8067
+#: src/compose.c:8085
 msgid "S_ubject:"
 msgstr ""
 
-#: src/compose.c:8291
+#: src/compose.c:8309
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:8438
+#: src/compose.c:8456
 msgid "_From:"
 msgstr ""
 
-#: src/compose.c:8455
+#: src/compose.c:8473
 msgid "Account to use for this email"
 msgstr ""
 
-#: src/compose.c:8457
+#: src/compose.c:8475
 msgid "Sender address to be used"
 msgstr ""
 
-#: src/compose.c:8639
+#: src/compose.c:8657
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
 
-#: src/compose.c:8750 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8768 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr ""
 
-#: src/compose.c:8851 src/prefs_template.c:752
+#: src/compose.c:8869 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:8948
+#: src/compose.c:8966
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr ""
 
-#: src/compose.c:9372
+#: src/compose.c:9390
 msgid "Invalid MIME type."
 msgstr ""
 
-#: src/compose.c:9387
+#: src/compose.c:9405
 msgid "File doesn't exist or is empty."
 msgstr ""
 
-#: src/compose.c:9461
+#: src/compose.c:9479
 msgid "Properties"
 msgstr ""
 
-#: src/compose.c:9479
+#: src/compose.c:9497
 msgid "MIME type"
 msgstr ""
 
-#: src/compose.c:9512
+#: src/compose.c:9530
 msgid "Encoding"
 msgstr ""
 
-#: src/compose.c:9532
+#: src/compose.c:9550
 msgid "Path"
 msgstr ""
 
-#: src/compose.c:9533
+#: src/compose.c:9551
 msgid "File name"
 msgstr ""
 
-#: src/compose.c:9792
+#: src/compose.c:9646
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+
+#: src/compose.c:9704
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: src/compose.c:9743
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr ""
+
+#: src/compose.c:9817
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 
-#: src/compose.c:10265 src/messageview.c:1088
+#: src/compose.c:10223 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
-#: src/compose.c:10458
+#: src/compose.c:10425
 msgid "Could not save draft."
 msgstr ""
 
-#: src/compose.c:10462
+#: src/compose.c:10429
 msgid "Could not save draft"
 msgstr ""
 
-#: src/compose.c:10463
+#: src/compose.c:10430
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: src/compose.c:10465
+#: src/compose.c:10432
 msgid "_Cancel exit"
 msgstr ""
 
-#: src/compose.c:10465
+#: src/compose.c:10432
 msgid "_Discard email"
 msgstr ""
 
-#: src/compose.c:10654 src/compose.c:10668
+#: src/compose.c:10621 src/compose.c:10635
 msgid "Select file"
 msgstr ""
 
-#: src/compose.c:10682
+#: src/compose.c:10649
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
-#: src/compose.c:10684
+#: src/compose.c:10651
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: src/compose.c:10763
+#: src/compose.c:10728
 msgid "Discard message"
 msgstr ""
 
-#: src/compose.c:10764
+#: src/compose.c:10729
 msgid "This message has been modified. Discard it?"
 msgstr ""
 
-#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10730 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr ""
 
-#: src/compose.c:10765 src/compose.c:10770
+#: src/compose.c:10730 src/compose.c:10735
 msgid "_Save to Drafts"
 msgstr ""
 
-#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10733 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr ""
 
-#: src/compose.c:10769
+#: src/compose.c:10734
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/compose.c:10770
+#: src/compose.c:10735
 msgid "_Don't save"
 msgstr ""
 
-#: src/compose.c:10841
+#: src/compose.c:10806
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr ""
 
-#: src/compose.c:10843
+#: src/compose.c:10808
 msgid "Apply template"
 msgstr ""
 
-#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/compose.c:10809 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
 #: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
 #: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr ""
 
-#: src/compose.c:11731
+#: src/compose.c:11694
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2286,20 +2305,20 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:11737
+#: src/compose.c:11700
 msgid "Insert or attach?"
 msgstr ""
 
-#: src/compose.c:11738
+#: src/compose.c:11701
 msgid "_Attach"
 msgstr ""
 
-#: src/compose.c:11956
+#: src/compose.c:11919
 #, c-format
 msgid "Quote format error at line %d."
 msgstr ""
 
-#: src/compose.c:12252
+#: src/compose.c:12215
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2488,7 +2507,7 @@ msgid " Check File "
 msgstr ""
 
 #: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2158
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2477
 #: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr ""
@@ -2537,12 +2556,12 @@ msgstr ""
 msgid "Input the new name of folder:"
 msgstr ""
 
-#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/editgroup.c:556 src/foldersel.c:573 src/imap_gtk.c:193 src/mh_gtk.c:144
 #: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr ""
 
-#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: src/editgroup.c:557 src/foldersel.c:574 src/mh_gtk.c:145
 #: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr ""
@@ -2571,13 +2590,13 @@ msgstr ""
 msgid "Edit LDAP - Select Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:3229
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr ""
 
 #: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3236
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr ""
@@ -2638,7 +2657,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:470 src/prefs_account.c:4213
 msgid "SSL/TLS"
 msgstr ""
 
@@ -2770,8 +2789,8 @@ msgstr ""
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 
-#: src/editldap.c:739 src/prefs_account.c:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: src/editldap.c:739 src/prefs_account.c:1477 src/prefs_account.c:2108
+#: src/prefs_account.c:3041 src/prefs_account.c:3069 src/prefs_account.c:3274
 #: src/prefs_proxy.c:146
 msgid "Show password"
 msgstr ""
@@ -2793,11 +2812,11 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:793 src/prefs_account.c:4086
 msgid "Basic"
 msgstr ""
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:795 src/gtk/quicksearch.c:703
 msgid "Extended"
 msgstr ""
 
@@ -2933,8 +2952,8 @@ msgstr ""
 #: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
 #: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1112
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6273
 msgid "None"
 msgstr ""
 
@@ -3153,7 +3172,7 @@ msgstr ""
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:113 src/summaryview.c:8486
 msgid "Export to mbox file"
 msgstr ""
 
@@ -3218,17 +3237,17 @@ msgstr ""
 msgid "Not specified."
 msgstr ""
 
-#: src/file_checker.c:82
+#: src/file_checker.c:81
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr ""
 
-#: src/file_checker.c:91 src/file_checker.c:115
+#: src/file_checker.c:90 src/file_checker.c:114
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr ""
 
-#: src/file_checker.c:106
+#: src/file_checker.c:105
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3318,51 +3337,51 @@ msgstr ""
 msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr ""
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr ""
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr ""
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr ""
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr ""
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr ""
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3373,11 +3392,11 @@ msgid ""
 "%s%s %s\n"
 msgstr ""
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ""
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3410,48 +3429,52 @@ msgstr ""
 msgid "Processing (%s)...\n"
 msgstr ""
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr ""
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr ""
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr ""
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr ""
 
-#: src/foldersel.c:250
+#: src/foldersel.c:251
 msgid "Select folder"
 msgstr ""
 
-#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/foldersel.c:575 src/imap_gtk.c:197 src/mh_gtk.c:146
 #: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr ""
 
-#: src/foldersel.c:582 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:576 src/imap_gtk.c:198 src/mh_gtk.c:147
+msgid "Inherit properties and processing rules from parent folder"
+msgstr ""
+
+#: src/foldersel.c:586 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
 #: src/plugins/rssyl/rssyl_cb_menu.c:202
@@ -3460,7 +3483,7 @@ msgstr ""
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
-#: src/foldersel.c:597 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:601 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
 #: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
 #: src/plugins/vcalendar/vcal_folder.c:2075
@@ -3468,7 +3491,7 @@ msgstr ""
 msgid "The folder '%s' already exists."
 msgstr ""
 
-#: src/foldersel.c:604 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:608 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:125
 #, c-format
@@ -3517,13 +3540,13 @@ msgstr ""
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6547
 msgid "New"
 msgstr ""
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6549
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr ""
@@ -3542,7 +3565,7 @@ msgstr "No."
 msgid "Setting folder info..."
 msgstr ""
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:868 src/summaryview.c:4291
 msgid "Mark all as read"
 msgstr ""
 
@@ -3552,11 +3575,11 @@ msgid ""
 "read?"
 msgstr ""
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:871 src/summaryview.c:4292
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:874 src/summaryview.c:4337
 msgid "Mark all as unread"
 msgstr ""
 
@@ -3566,16 +3589,16 @@ msgid ""
 "unread?"
 msgstr ""
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:877 src/summaryview.c:4338
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 
-#: src/folderview.c:1067 src/imap.c:4643
+#: src/folderview.c:1067 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr ""
 
-#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4690 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr ""
@@ -3632,7 +3655,7 @@ msgstr "Delete all messages in wastebin?"
 msgid "_Empty trash"
 msgstr "_Empty wastebin"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2532 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr ""
 
@@ -3652,7 +3675,7 @@ msgstr ""
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
-#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
+#: src/folderview.c:2557 src/main.c:2886 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3716,7 +3739,7 @@ msgstr ""
 msgid "Processing configuration for folder %s"
 msgstr ""
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3175 src/summaryview.c:4746 src/summaryview.c:4852
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 
@@ -3766,7 +3789,7 @@ msgstr ""
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1863 src/summaryview.c:1683
 msgid "Done."
 msgstr ""
 
@@ -3796,7 +3819,7 @@ msgstr ""
 
 #: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -3934,44 +3957,44 @@ msgid ""
 "this program. If not, see "
 msgstr ""
 
-#: src/gtk/about.c:718 src/main.c:2636
+#: src/gtk/about.c:718 src/main.c:2710
 msgid "Session statistics\n"
 msgstr ""
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2720 src/main.c:2723
 #, c-format
 msgid "Started: %s\n"
 msgstr ""
 
-#: src/gtk/about.c:738 src/main.c:2655
+#: src/gtk/about.c:738 src/main.c:2729
 msgid "Incoming traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:741 src/main.c:2658
+#: src/gtk/about.c:741 src/main.c:2732
 #, c-format
 msgid "Received messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:748 src/main.c:2664
+#: src/gtk/about.c:748 src/main.c:2738
 msgid "Outgoing traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:751 src/main.c:2667
+#: src/gtk/about.c:751 src/main.c:2741
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:756 src/main.c:2671
+#: src/gtk/about.c:756 src/main.c:2745
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:761 src/main.c:2675
+#: src/gtk/about.c:761 src/main.c:2749
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:766 src/main.c:2679
+#: src/gtk/about.c:766 src/main.c:2753
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr ""
@@ -4175,20 +4198,20 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/gtk/gtkutils.c:1862
+#: src/gtk/gtkutils.c:1868
 msgid "Failed: no service record found."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1865
+#: src/gtk/gtkutils.c:1871
 msgid "Failed: network error."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1868
+#: src/gtk/gtkutils.c:1874
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr ""
 
-#: src/gtk/gtkutils.c:1938
+#: src/gtk/gtkutils.c:1944
 msgid "Configuring..."
 msgstr ""
 
@@ -4432,7 +4455,7 @@ msgstr ""
 msgid "Content-Type"
 msgstr ""
 
-#: src/gtk/headers.h:42 src/image_viewer.c:340
+#: src/gtk/headers.h:42 src/image_viewer.c:346
 msgid "Content-Type:"
 msgstr ""
 
@@ -4460,7 +4483,7 @@ msgstr ""
 msgid "Precedence:"
 msgstr ""
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1241
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4773,7 +4796,8 @@ msgstr ""
 #: 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/libravatar/libravatar_prefs.c:563
+#: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
@@ -4786,7 +4810,7 @@ msgstr ""
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/spamassassin/spamassassin_gtk.c:673
 #: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr ""
@@ -4829,11 +4853,11 @@ msgid "_Hide"
 msgstr ""
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:3721 src/prefs_account.c:3739 src/prefs_account.c:3757
-#: src/prefs_account.c:3775 src/prefs_account.c:3793 src/prefs_account.c:3811
-#: src/prefs_account.c:3830 src/prefs_account.c:3923 src/prefs_account.c:3941
-#: src/prefs_filtering_action.c:1380 src/prefs_filtering.c:398
-#: src/prefs_filtering.c:1884
+#: src/prefs_account.c:4085 src/prefs_account.c:4103 src/prefs_account.c:4121
+#: src/prefs_account.c:4139 src/prefs_account.c:4157 src/prefs_account.c:4175
+#: src/prefs_account.c:4193 src/prefs_account.c:4212 src/prefs_account.c:4305
+#: src/prefs_account.c:4323 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:398 src/prefs_filtering.c:1884
 msgid "Account"
 msgstr ""
 
@@ -5051,51 +5075,51 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:637
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:699
 msgid "From/To/Cc/Subject/Tag"
 msgstr ""
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:710 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr ""
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:719
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:729
 msgid "Type-ahead"
 msgstr ""
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:741
 msgid "Run on select"
 msgstr ""
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:777
 msgid "Clear the current search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:790 src/summary_search.c:413
+#: src/gtk/quicksearch.c:787 src/summary_search.c:413
 msgid "Edit search criteria"
 msgstr ""
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:796
 msgid "Information about extended symbols"
 msgstr ""
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
+#: src/gtk/quicksearch.c:834 src/gtk/quicksearch.c:858
 msgid "_Information"
 msgstr ""
 
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:835 src/gtk/quicksearch.c:859
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
+#: src/gtk/quicksearch.c:836 src/gtk/quicksearch.c:860 src/prefs_actions.c:349
 #: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr ""
@@ -5262,211 +5286,211 @@ msgstr ""
 msgid "(No Subject)"
 msgstr ""
 
-#: src/image_viewer.c:127
+#: src/image_viewer.c:128
 msgid "Error:"
 msgstr ""
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
+#: src/image_viewer.c:318 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
 #: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr ""
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:325
 msgid "Filesize:"
 msgstr ""
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:374
 msgid "Load Image"
 msgstr ""
 
-#: src/imap.c:577
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr ""
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
+#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
+#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
+#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
+#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
+#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
+#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
+#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
+#: src/imap.c:751 src/imap.c:755
 #, c-format
 msgid "IMAP error on %s:"
 msgstr ""
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "authenticated"
 msgstr ""
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr ""
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "bad state"
 msgstr ""
 
-#: src/imap.c:631
+#: src/imap.c:637
 msgid "stream error"
 msgstr ""
 
-#: src/imap.c:634
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:638
+#: src/imap.c:644
 msgid "connection refused"
 msgstr ""
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "memory error"
 msgstr ""
 
-#: src/imap.c:644
+#: src/imap.c:650
 msgid "fatal error"
 msgstr ""
 
-#: src/imap.c:647
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:651
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr ""
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr ""
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr ""
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr ""
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr ""
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr ""
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr ""
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr ""
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "COPY error"
 msgstr ""
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr ""
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr ""
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr ""
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr ""
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr ""
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr ""
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LIST error"
 msgstr ""
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr ""
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr ""
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr ""
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr ""
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr ""
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr ""
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr ""
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "STORE error"
 msgstr ""
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr ""
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr ""
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr ""
 
-#: src/imap.c:738
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr ""
 
-#: src/imap.c:741
+#: src/imap.c:747
 msgid "SASL error"
 msgstr ""
 
-#: src/imap.c:745
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr ""
 
-#: src/imap.c:749
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr ""
 
-#: src/imap.c:955
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5474,7 +5498,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:961
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5482,7 +5506,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:967
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5490,7 +5514,7 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:973
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5498,7 +5522,7 @@ msgid ""
 "the PLAIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:979
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5506,36 +5530,36 @@ msgid ""
 "the LOGIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:986
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
-#: src/imap.c:990
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
-#: src/imap.c:1008
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
-#: src/imap.c:1015 src/imap.c:1018
+#: src/imap.c:1028 src/imap.c:1031
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
-#: src/imap.c:4624 src/imap.c:5435
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
-#: src/imap.c:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr ""
 
-#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5544,128 +5568,128 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr ""
 
-#: src/imap.c:1174
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr ""
 
-#: src/imap.c:1239
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr ""
 
-#: src/imap.c:1242
+#: src/imap.c:1255
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1274 src/imap.c:4114
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr ""
 
-#: src/imap.c:1343
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr ""
 
-#: src/imap.c:1346
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
-#: src/imap.c:1774
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr ""
 
-#: src/imap.c:1979 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr ""
 
-#: src/imap.c:2504
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr ""
 
-#: src/imap.c:2586
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2593 src/imap.c:5065
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:2944
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2947
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3235
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3248
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3379
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3492
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3771
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3856
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:3959
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4111
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4121
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4126
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
 msgstr ""
 
-#: src/imap.c:4134
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4357
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr ""
 
-#: src/imap.c:5058
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:6093
+#: src/imap.c:6136
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -5739,10 +5763,6 @@ msgid ""
 "only and no mail, append '/' to the folder name)"
 msgstr ""
 
-#: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties and processing rules from parent folder"
-msgstr ""
-
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
 #: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
 #: src/plugins/vcalendar/vcal_folder.c:2060
@@ -5854,7 +5874,7 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: src/import.c:113 src/import.c:208
+#: src/import.c:113 src/import.c:209
 msgid "Import mbox file"
 msgstr ""
 
@@ -5866,25 +5886,29 @@ msgstr ""
 msgid "Destination folder:"
 msgstr ""
 
-#: src/import.c:203
+#: src/import.c:204
 msgid "Source mbox filename can't be left empty."
 msgstr ""
 
-#: src/import.c:208
+#: src/import.c:209
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
 msgstr ""
 
-#: src/import.c:230
+#: src/import.c:231
 msgid "Can't find the destination folder."
 msgstr ""
 
-#: src/import.c:263
+#: src/import.c:236
+msgid "Importing mbox file..."
+msgstr ""
+
+#: src/import.c:258
 msgid "Select importing file"
 msgstr ""
 
-#: src/import.c:281
+#: src/import.c:276
 msgid "Select folder to import to"
 msgstr ""
 
@@ -6029,242 +6053,242 @@ msgstr ""
 msgid "Import Pine file into Address Book"
 msgstr ""
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr ""
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr ""
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr ""
 
-#: src/inc.c:719 src/prefs_matcher.c:407 src/prefs_summaries.c:645
-#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6569
+#: src/inc.c:724 src/prefs_matcher.c:407 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6573
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:397
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr ""
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr ""
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
-#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr ""
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr ""
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr ""
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr ""
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr ""
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr ""
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr ""
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr ""
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1072
 #: src/plugins/notification/notification_prefs.c:1367
 #: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
+#: src/plugins/spamassassin/spamassassin_gtk.c:410 src/prefs_account.c:1869
 #: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
 msgid "seconds"
 msgstr ""
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr ""
 
-#: src/inc.c:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr ""
 
@@ -6308,14 +6332,14 @@ msgid ""
 "Can't create folder."
 msgstr ""
 
-#: src/main.c:375
+#: src/main.c:380
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 
-#: src/main.c:377
+#: src/main.c:382
 #, c-format
 msgid ""
 "\n"
@@ -6324,42 +6348,42 @@ msgid ""
 "script available at %s."
 msgstr ""
 
-#: src/main.c:389
+#: src/main.c:394
 msgid "Keep old configuration"
 msgstr ""
 
-#: src/main.c:392
+#: src/main.c:397
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
 "on your disk."
 msgstr ""
 
-#: src/main.c:400
+#: src/main.c:405
 msgid "Migration of configuration"
 msgstr ""
 
-#: src/main.c:411
+#: src/main.c:416
 msgid "Copying configuration... This may take a while..."
 msgstr ""
 
-#: src/main.c:420
+#: src/main.c:425
 msgid "Migration failed!"
 msgstr ""
 
-#: src/main.c:429
+#: src/main.c:434
 msgid "Migrating configuration..."
 msgstr ""
 
-#: src/main.c:1141
+#: src/main.c:1146
 msgid "g_thread is not supported by glib.\n"
 msgstr ""
 
-#: src/main.c:1161 src/main.c:1165 src/main.c:1169
+#: src/main.c:1166 src/main.c:1170 src/main.c:1174
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1510
+#: src/main.c:1515
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6372,50 +6396,90 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.c:1552
+#: src/main.c:1557
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1563
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
 "plugin and try again."
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1804
 msgid "Missing filename\n"
 msgstr ""
 
-#: src/main.c:1806
+#: src/main.c:1811
 msgid "Cannot open filename for reading\n"
 msgstr ""
 
-#: src/main.c:1817
+#: src/main.c:1822
 msgid "Malformed header\n"
 msgstr ""
 
-#: src/main.c:1824
+#: src/main.c:1829
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1840
 msgid "Missing required 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1980
+#: src/main.c:1866
+#, c-format
+msgid "%s. Try -h or --help for usage.\n"
+msgstr ""
+
+#: src/main.c:1893 src/main.c:1956
+#, c-format
+msgid "Missing file argument for option %s"
+msgstr ""
+
+#: src/main.c:1915
+#, c-format
+msgid "Missing or empty uri argument for option %s"
+msgstr ""
+
+#: src/main.c:1918
+#, c-format
+msgid "Missing uri argument for option %s"
+msgstr ""
+
+#: src/main.c:1951
+#, c-format
+msgid "Missing at least one non-empty file argument for option %s"
+msgstr ""
+
+#: src/main.c:2020
+#, c-format
+msgid "Missing folder, type and request arguments for option %s"
+msgstr ""
+
+#: src/main.c:2023
+#, c-format
+msgid "Missing type and request arguments for option %s"
+msgstr ""
+
+#: src/main.c:2026
+#, c-format
+msgid "Missing request argument for option %s"
+msgstr ""
+
+#: src/main.c:2042
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:1982
+#: src/main.c:2044
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:1983
+#: src/main.c:2045
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6426,41 +6490,41 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 
-#: src/main.c:1988
+#: src/main.c:2050
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 
-#: src/main.c:1989
+#: src/main.c:2051
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:1992
+#: src/main.c:2054
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         inserted"
 msgstr ""
 
-#: src/main.c:1995
+#: src/main.c:2057
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:1996
+#: src/main.c:2058
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:1997
+#: src/main.c:2059
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr ""
 
-#: src/main.c:1998
+#: src/main.c:2060
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr ""
 
-#: src/main.c:1999
+#: src/main.c:2061
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6471,110 +6535,126 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:2006
+#: src/main.c:2068
 msgid "  --send                 send all queued messages"
 msgstr ""
 
-#: src/main.c:2007
+#: src/main.c:2069
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2070
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
-#: src/main.c:2010
+#: src/main.c:2072
 msgid "  --statistics           show session statistics"
 msgstr ""
 
-#: src/main.c:2011
+#: src/main.c:2073
 msgid "  --reset-statistics     reset session statistics"
 msgstr ""
 
-#: src/main.c:2012
+#: src/main.c:2074
 msgid ""
-"  --select folder[/msg]  jumps to the specified folder/message\n"
-"                         folder is a folder id like 'folder/sub_folder'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 msgstr ""
 
-#: src/main.c:2014
+#: src/main.c:2076
 msgid "  --online               switch to online mode"
 msgstr ""
 
-#: src/main.c:2015
+#: src/main.c:2077
 msgid "  --offline              switch to offline mode"
 msgstr ""
 
-#: src/main.c:2016
+#: src/main.c:2078
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr ""
 
-#: src/main.c:2017
-msgid "  --debug                debug mode"
+#: src/main.c:2079
+msgid "  --debug -d             debug mode"
 msgstr ""
 
-#: src/main.c:2018
+#: src/main.c:2080
 msgid "  --toggle-debug         toggle debug mode"
 msgstr ""
 
-#: src/main.c:2019
-msgid "  --help -h              display this help and exit"
+#: src/main.c:2081
+msgid "  --help -h              display this help"
 msgstr ""
 
-#: src/main.c:2020
-msgid "  --version -v           output version information and exit"
+#: src/main.c:2082
+msgid "  --version -v           output version information"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2083
 msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
+"  --version-full -V      output version and built-in features information"
 msgstr ""
 
-#: src/main.c:2022
+#: src/main.c:2084
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
-#: src/main.c:2023
+#: src/main.c:2085
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2087
 msgid ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
 
-#: src/main.c:2078
-msgid "Unknown option. Try -h or --help for usage.\n"
+#: src/main.c:2104
+#, c-format
+msgid "Missing directory argument for option %s"
+msgstr ""
+
+#: src/main.c:2112
+#, c-format
+msgid "Missing geometry argument for option %s"
+msgstr ""
+
+#: src/main.c:2123
+#, c-format
+msgid "Missing folder argument for option %s"
+msgstr ""
+
+#: src/main.c:2156 src/main.c:2159
+#, c-format
+msgid "Unknown option %s"
 msgstr ""
 
-#: src/main.c:2096
+#: src/main.c:2175
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
-#: src/main.c:2099
+#: src/main.c:2178
 msgid "top level folder"
 msgstr ""
 
-#: src/main.c:2181
+#: src/main.c:2260
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:2182
+#: src/main.c:2261
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
-#: src/main.c:2940
+#: src/main.c:3014
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:2946
+#: src/main.c:3020
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
@@ -7336,7 +7416,7 @@ msgstr ""
 msgid "_Auto detect"
 msgstr ""
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1305 src/summaryview.c:6499
 msgid "Apply tags..."
 msgstr ""
 
@@ -7496,7 +7576,7 @@ msgstr ""
 msgid "Select folder to go to"
 msgstr ""
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5069 src/summaryview.c:5942
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
@@ -7504,7 +7584,7 @@ msgstr ""
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5085 src/summaryview.c:5953
 msgid "Filtering configuration"
 msgstr ""
 
@@ -7814,8 +7894,8 @@ msgid ""
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4423
+#: src/summaryview.c:7302
 msgid "An error happened while learning.\n"
 msgstr ""
 
@@ -7920,7 +8000,7 @@ msgid "Go back to email"
 msgstr ""
 
 #: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
-#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
+#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:451
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
@@ -7980,8 +8060,8 @@ msgstr ""
 msgid "'%s' is not a directory."
 msgstr ""
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:704
+#: src/summaryview.c:5035
 msgid "Save as"
 msgstr ""
 
@@ -8029,7 +8109,7 @@ msgstr ""
 msgid "Size:"
 msgstr ""
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1242
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
@@ -8134,6 +8214,75 @@ msgstr ""
 msgid "Rename newsgroup folder"
 msgstr ""
 
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr ""
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr ""
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr ""
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr ""
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr ""
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr ""
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr ""
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr ""
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr ""
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr ""
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr ""
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr ""
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
+msgstr ""
+
+#: src/oauth2.c:583
+#, c-format
+msgid "OAuth2 original: %s\n"
+msgstr ""
+
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
+msgstr ""
+
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
+msgstr ""
+
 #: src/password.c:128 src/password.c:129
 msgid "Input master passphrase"
 msgstr ""
@@ -8306,7 +8455,7 @@ msgstr ""
 #: 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:463
+#: src/plugins/spamassassin/spamassassin_gtk.c:466
 #: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
 #: src/prefs_matcher.c:690
 msgid "Select..."
@@ -8890,9 +9039,9 @@ msgstr ""
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:118
-#: src/plugins/spamassassin/spamassassin_gtk.c:459
-#: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
+#: src/plugins/spamassassin/spamassassin_gtk.c:462
+#: src/plugins/spamassassin/spamassassin_gtk.c:511
+#: src/plugins/spamassassin/spamassassin_gtk.c:638 src/prefs_matcher.c:686
 #: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
 #: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
 #: src/prefs_matcher.c:2590
@@ -8971,25 +9120,25 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Process messages on receiving"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:374
+#: src/plugins/spamassassin/spamassassin_gtk.c:377
 msgid "Maximum size"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:383
+#: src/plugins/spamassassin/spamassassin_gtk.c:386
 msgid "Messages larger than this will not be checked"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:389 src/prefs_account.c:1718
 msgid "KB"
 msgstr ""
 
@@ -9007,7 +9156,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:432
+#: src/plugins/spamassassin/spamassassin_gtk.c:435
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9015,7 +9164,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:438
+#: src/plugins/spamassassin/spamassassin_gtk.c:441
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 
@@ -9043,13 +9192,13 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: src/plugins/spamassassin/spamassassin_gtk.c:456
 msgid "Whitelist senders found in address book/folder"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:457
+#: src/plugins/spamassassin/spamassassin_gtk.c:460
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9057,7 +9206,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:467
+#: src/plugins/spamassassin/spamassassin_gtk.c:470
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 
@@ -9082,7 +9231,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Mark spam as read"
 msgstr ""
 
@@ -9134,7 +9283,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:424
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid "Save spam in"
 msgstr ""
 
@@ -9433,7 +9582,7 @@ msgstr ""
 msgid "Do nothing (remote content is disabled)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4306
 #: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr ""
@@ -9447,6 +9596,7 @@ msgid "Use proxy"
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr ""
 
@@ -9460,6 +9610,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:245
+#: src/plugins/litehtml_viewer/lh_prefs.c:121
 msgid "Enable loading of remote content"
 msgstr ""
 
@@ -9478,7 +9629,7 @@ msgstr ""
 #: 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:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_account.c:1622 src/prefs_account.c:1741 src/prefs_account.c:2509
 #: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr ""
@@ -9487,89 +9638,89 @@ msgstr ""
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:420
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:499
 msgid "Load images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:501
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:503
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:505
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:507
 msgid "Enable Java"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:509
 msgid "Open links with external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:684
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:744
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Search the Web"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:766
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:775
 msgid "Open in Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:785
 msgid "Open Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:794
 msgid "Copy Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Download Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:809
 msgid "Save Image As"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:819
 msgid "Copy Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:859
 msgid "Import feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1141
 msgid "Fancy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1169
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1174
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9653,7 +9804,7 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
-msgstr ""
+msgstr "GData plugin: Authorisation required"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:132
 msgid ""
@@ -9665,6 +9816,13 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"You need to authorise Claws Mail to access your Google contact list to use "
+"the GData plugin.\n"
+"\n"
+"Visit Google's authorisation page by pressing the button below. After you "
+"confirmed the authorisation, you will get an authorisation code. Enter that "
+"code in the field below to grant Claws Mail access to your Google contact "
+"list."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:147
 msgid "Step 1:"
@@ -9672,7 +9830,7 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Click here to open the Google authorisation page in a browser"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:157
 msgid "Step 2:"
@@ -9723,40 +9881,44 @@ msgstr ""
 #: src/plugins/gdata/cm_gdata_contacts.c:447
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr ""
+msgstr "GData plugin: Authorisation error: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:454
 msgid "GData plugin: Authorization successful\n"
-msgstr ""
+msgstr "GData plugin: Authorisation successful\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr ""
+msgstr "GData plugin: Starting interactive authorisation\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr ""
+msgstr "GData plugin: Got authorization code, requesting authorisation\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:488
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"GData plugin: No authorisation code received, authorisation request "
+"cancelled\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:494
 msgid ""
 "GData plugin: Interactive authorization still running, no additional session "
 "started\n"
 msgstr ""
+"GData plugin: Interactive authorisation still running, no additional session "
+"started\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:511
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr ""
+msgstr "GData plugin: Authorisation refresh error: %s\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:535
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr ""
+msgstr "GData plugin: Authorisation refresh successful\n"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:595
 #, c-format
@@ -9766,10 +9928,10 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:603
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr ""
+msgstr "GData plugin: Trying to refresh authorisation\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1921
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:2025
 msgid "Authentication"
 msgstr ""
 
@@ -9814,30 +9976,30 @@ msgstr ""
 msgid "GData integration"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:332
-#: src/plugins/libravatar/libravatar.c:397
-#: src/plugins/libravatar/libravatar.c:457
-#: src/plugins/libravatar/libravatar_prefs.c:546
+#: src/plugins/libravatar/libravatar.c:334
+#: src/plugins/libravatar/libravatar.c:399
+#: src/plugins/libravatar/libravatar.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:339
+#: src/plugins/libravatar/libravatar.c:341
 msgid "Failed to register avatar header update hook"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:348
+#: src/plugins/libravatar/libravatar.c:350
 msgid "Failed to register avatar image render hook"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:356
 msgid "Failed to create avatar image cache directory"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:364
+#: src/plugins/libravatar/libravatar.c:366
 msgid "Failed to load missing items cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:407
+#: src/plugins/libravatar/libravatar.c:409
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -9853,33 +10015,33 @@ msgid ""
 "Feedback to <ricardo at mones.org> is welcome.\n"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:137
+#: src/plugins/libravatar/libravatar_prefs.c:146
 msgid "Error reading cache stats"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
+#: src/plugins/libravatar/libravatar_prefs.c:159
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:164
+#: src/plugins/libravatar/libravatar_prefs.c:173
 msgid "Clear icon cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:165
+#: src/plugins/libravatar/libravatar_prefs.c:174
 msgid "Are you sure you want to remove all cached avatar icons?"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:178
+#: src/plugins/libravatar/libravatar_prefs.c:187
 msgid "Not enough memory for operation"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:183
+#: src/plugins/libravatar/libravatar_prefs.c:192
 #, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
@@ -9887,11 +10049,11 @@ msgid ""
 "• %u files removed."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:188
+#: src/plugins/libravatar/libravatar_prefs.c:197
 msgid "Icon cache successfully cleared!"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:191
+#: src/plugins/libravatar/libravatar_prefs.c:200
 #, c-format
 msgid ""
 "Errors clearing icon cache:\n"
@@ -9901,131 +10063,180 @@ msgid ""
 "• %u files couldn't be removed."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:198
+#: src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Error clearing icon cache."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:213
+#: src/plugins/libravatar/libravatar_prefs.c:222
 msgid "_Use cached icons"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:214
+#: src/plugins/libravatar/libravatar_prefs.c:223
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/libravatar/libravatar_prefs.c:238
 msgid "Cache refresh interval"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1595
-#: src/prefs_account.c:1752 src/prefs_matcher.c:340 src/prefs_receive.c:180
+#: src/plugins/libravatar/libravatar_prefs.c:238
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1697
+#: src/prefs_account.c:1855 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:305
+#: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "Mystery man"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:306
+#: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "Identicon"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:307
+#: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "MonsterID"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:308
+#: src/plugins/libravatar/libravatar_prefs.c:319
 msgid "Wavatar"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:309
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Retro"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:310
+#: src/plugins/libravatar/libravatar_prefs.c:321
+msgid "Robohash"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:322
+msgid "Pagan"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Custom URL"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "A blank image"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
+#: src/plugins/libravatar/libravatar_prefs.c:328
 msgid "A generated geometric pattern"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:329
 msgid "A generated full-body monster"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
-msgid "Redirect to a user provided URL"
+#: src/plugins/libravatar/libravatar_prefs.c:332
+msgid "A generated robotic character"
 msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:333
+msgid "A generated retro adventure game character"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:334
+msgid "Redirect to a user provided URL"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:348
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
+#: src/plugins/libravatar/libravatar_prefs.c:427
 msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr ""
 
+#: src/plugins/litehtml_viewer/lh_prefs.c:116
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network."
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:133
+msgid "Size of image cache in megabytes"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:148
+msgid "Default font"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+msgid "Open Link"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+msgid "Copy Link Location"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/plugin.c:50
+msgid "LiteHTML viewer"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/plugin.c:55
+msgid ""
+"Viewer plugin for HTML emails, using the litehtml library (http://www."
+"litehtml.com/)."
+msgstr ""
+
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
 msgstr ""
@@ -10110,7 +10321,7 @@ msgstr ""
 msgid "sending error on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5834
 msgid "_Filter"
 msgstr ""
 
@@ -10167,7 +10378,7 @@ msgid "%s - Sieve Filter%s"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1315
+#: src/plugins/pdf_viewer/poppler_viewer.c:1320
 msgid "Loading..."
 msgstr ""
 
@@ -10238,7 +10449,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1265
 msgid "Server information"
 msgstr ""
 
@@ -10289,28 +10500,28 @@ msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
-#: src/prefs_account.c:1967
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1460
+#: src/prefs_account.c:2072
 msgid "User ID"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
-#: src/prefs_account.c:1990 src/prefs_account.c:2718 src/prefs_account.c:2746
-#: src/prefs_account.c:2943 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1466
+#: src/prefs_account.c:2095 src/prefs_account.c:3037 src/prefs_account.c:3065
+#: src/prefs_account.c:3262 src/prefs_proxy.c:134 src/wizard.c:1216
 #: src/wizard.c:1636
 msgid "Password"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1678
-#: src/prefs_account.c:1939
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1649
+#: src/prefs_account.c:1780 src/prefs_account.c:2043
 msgid "Authentication method"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1688
-#: src/prefs_account.c:1948 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1790
+#: src/prefs_account.c:2052 src/prefs_send.c:265 src/prefs_send.c:336
 #: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr ""
@@ -10371,8 +10582,8 @@ msgstr ""
 msgid "No new messages"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:420
+#: src/plugins/notification/notification_plugin.c:220
+#: src/plugins/notification/notification_plugin.c:424
 #: src/plugins/notification/notification_prefs.c:399
 #: src/plugins/notification/notification_prefs.c:414
 #: src/plugins/notification/notification_prefs.c:433
@@ -10384,43 +10595,43 @@ msgstr ""
 msgid "Notification"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:221
+#: src/plugins/notification/notification_plugin.c:225
 msgid "The Notification plugin needs threading support."
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:228
+#: src/plugins/notification/notification_plugin.c:232
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:236
+#: src/plugins/notification/notification_plugin.c:240
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:246
+#: src/plugins/notification/notification_plugin.c:250
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:256
+#: src/plugins/notification/notification_plugin.c:260
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:267
+#: src/plugins/notification/notification_plugin.c:271
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:280
+#: src/plugins/notification/notification_plugin.c:284
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:293
+#: src/plugins/notification/notification_plugin.c:297
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:306
+#: src/plugins/notification/notification_plugin.c:310
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:425
+#: src/plugins/notification/notification_plugin.c:429
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -10430,7 +10641,7 @@ msgid ""
 "Feedback to <berndth at gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:450
+#: src/plugins/notification/notification_plugin.c:454
 msgid "Various tools"
 msgstr ""
 
@@ -10913,95 +11124,95 @@ msgstr ""
 msgid "Optimized:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1222
 msgid "PDF properties"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1371
 msgid "Enter password"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1367
+#: src/plugins/pdf_viewer/poppler_viewer.c:1372
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1387
 #, c-format
 msgid "%s Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "of %d"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1404
+#: src/plugins/pdf_viewer/poppler_viewer.c:1409
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1776
-#: src/plugins/pdf_viewer/poppler_viewer.c:1993
+#: src/plugins/pdf_viewer/poppler_viewer.c:1781
+#: src/plugins/pdf_viewer/poppler_viewer.c:1998
 msgid "Document Index"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1963
 msgid "First Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1966
 msgid "Previous Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1969
 msgid "Next Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Last Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom In"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1977
 msgid "Zoom Out"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1980
 msgid "Fit Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1983
 msgid "Fit Page Width"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1986
 msgid "Rotate Left"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1989
 msgid "Rotate Right"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1992
 msgid "Print Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Document Info"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Page Number"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2002
 msgid "Zoom Factor"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2108
+#: src/plugins/pdf_viewer/poppler_viewer.c:2113
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11010,13 +11221,13 @@ msgid ""
 "Any feedback is welcome: iwkse at claws-mail.org"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2114
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
-#: src/plugins/pdf_viewer/poppler_viewer.c:2142
+#: src/plugins/pdf_viewer/poppler_viewer.c:2119
+#: src/plugins/pdf_viewer/poppler_viewer.c:2127
+#: src/plugins/pdf_viewer/poppler_viewer.c:2147
 msgid "PDF Viewer"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2118
+#: src/plugins/pdf_viewer/poppler_viewer.c:2123
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11062,69 +11273,81 @@ msgstr ""
 msgid "Bad passphrase.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:174
+#: src/plugins/pgpcore/pgp_viewer.c:180
 msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it "
-"from a keyserver?"
+"This key is not in your keyring. Do you want Claws Mail to try and import it?"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "_No"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:194
 msgid ""
-"with the following command: \n"
+"with either of the following commands: \n"
 "\n"
 "     "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:269
+#: src/plugins/pgpcore/pgp_viewer.c:280
 msgid "   This key has been imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:282
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr ""
 
@@ -11174,8 +11397,8 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 
 #: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1862
+#: src/prefs_account.c:2161 src/prefs_receive.c:190
 msgid "minutes"
 msgstr ""
 
@@ -11746,8 +11969,8 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2707
-#: src/prefs_account.c:2735 src/prefs_account.c:3172 src/wizard.c:1206
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:3026
+#: src/prefs_account.c:3054 src/prefs_account.c:3491 src/wizard.c:1206
 #: src/wizard.c:1626
 msgid "Browse"
 msgstr ""
@@ -12011,7 +12234,7 @@ msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
 #: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/prefs_account.c:1687 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr ""
 
@@ -12307,7 +12530,7 @@ msgid "Password:"
 msgstr ""
 
 #: src/plugins/spamassassin/spamassassin.c:78
-#: src/plugins/spamassassin/spamassassin_gtk.c:671
+#: src/plugins/spamassassin/spamassassin_gtk.c:674
 msgid "SpamAssassin"
 msgstr ""
 
@@ -12362,67 +12585,67 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:95
 msgid "TCP"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:94
+#: src/plugins/spamassassin/spamassassin_gtk.c:97
 msgid "Unix Socket"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:122
+#: src/plugins/spamassassin/spamassassin_gtk.c:125
 msgid "Select folder to save spam to"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:277
 msgid "Enable SpamAssassin plugin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:278
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Transport"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:286
+#: src/plugins/spamassassin/spamassassin_gtk.c:289
 msgid "Type of transport"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:307
+#: src/plugins/spamassassin/spamassassin_gtk.c:310
 msgid "User"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:320
+#: src/plugins/spamassassin/spamassassin_gtk.c:323
 msgid "User to use with spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:322
+#: src/plugins/spamassassin/spamassassin_gtk.c:325
 msgid "spamd"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:340
+#: src/plugins/spamassassin/spamassassin_gtk.c:343
 msgid "Hostname or IP address of spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgid "Port of spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:360
 msgid "Path of Unix socket"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/spamassassin/spamassassin_gtk.c:367
 msgid "Use compression"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
+#: src/plugins/spamassassin/spamassassin_gtk.c:371
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:403
+#: src/plugins/spamassassin/spamassassin_gtk.c:406
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -12630,147 +12853,147 @@ msgstr ""
 msgid "Decline"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:476
 msgid "You have a Todo item."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
-#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
-#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
+#: src/plugins/vcalendar/vcalendar.c:477 src/plugins/vcalendar/vcalendar.c:484
+#: src/plugins/vcalendar/vcalendar.c:489 src/plugins/vcalendar/vcalendar.c:497
+#: src/plugins/vcalendar/vcalendar.c:506 src/plugins/vcalendar/vcalendar.c:718
 msgid "Details follow:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:483
 msgid "You have created a meeting."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:488
 msgid "You have been invited to a meeting."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:496
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:505
 msgid "You have been forwarded an appointment."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:559
 msgid "(this event recurs)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:566
 msgid "(this event is part of a recurring event)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:717
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:721
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:800
 msgid "Error - could not get the calendar MIME part."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:807
 msgid "Error - no calendar part found."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:821
 msgid "Error - Unknown calendar component type."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:953
 msgid "Send a notification to the attendees"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:962
 msgid "Cancel meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:963
 msgid "Are you sure you want to cancel this meeting?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "No account found"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1061
 msgid "Reply anyway"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Answer"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Edit meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Cancel meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Launch website"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1197
 msgid "You are already busy at this time."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcalendar.c:1236
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcalendar.c:1237
 #: 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:1236
+#: src/plugins/vcalendar/vcalendar.c:1238
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcalendar.c:1239
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1240
 msgid "Starting:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Ending:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcalendar.c:1243
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
 #: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1245
 msgid "Action:"
 msgstr ""
 
@@ -13353,605 +13576,657 @@ msgstr ""
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr ""
 
-#: src/pop.c:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr ""
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr ""
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr ""
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr ""
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr ""
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr ""
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr ""
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr ""
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr ""
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:396 src/prefs_account.c:1631 src/prefs_account.c:2954
 msgid "POP"
 msgstr ""
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/prefs_account.c:397 src/prefs_account.c:1774 src/prefs_account.c:2969
 #: src/wizard.c:1501
 msgid "IMAP"
 msgstr ""
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:398
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:399 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr ""
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:400
 msgid "None (SMTP only)"
 msgstr ""
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1203
 msgid "Name of account"
 msgstr ""
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1212
 msgid "Set as default"
 msgstr ""
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1220
 msgid "Personal information"
 msgstr ""
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1229
 msgid "Full name"
 msgstr ""
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1235
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1298 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1300 src/wizard.c:1526
 msgid "Cancel"
 msgstr ""
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1317
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
 msgstr ""
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1348
 msgid "This server requires authentication"
 msgstr ""
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1355
 msgid "Authenticate on connect"
 msgstr ""
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1417
 msgid "News server"
 msgstr ""
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1423
 msgid "Server for receiving"
 msgstr ""
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1429
 msgid "Local mailbox"
 msgstr ""
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1436
 msgid "SMTP server (send)"
 msgstr ""
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1444
 msgid "Use mail command rather than SMTP server"
 msgstr ""
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1453
 msgid "command to send mails"
 msgstr ""
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1526
 #, c-format
 msgid "Account%d"
 msgstr ""
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Local"
 msgstr ""
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1611 src/prefs_account.c:1730
 msgid "Default Inbox"
 msgstr ""
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1618 src/prefs_account.c:1625 src/prefs_account.c:1737
+#: src/prefs_account.c:1744
 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
+#: src/prefs_account.c:1634
+msgid "Authenticate before POP connection"
+msgstr ""
+
+#: src/prefs_account.c:1658 src/prefs_account.c:2259
+msgid "Select"
 msgstr ""
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1666
 msgid "Remove messages on server when received"
 msgstr ""
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1677
 msgid "Remove after"
 msgstr ""
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1684 src/prefs_account.c:1694
 msgid "0 days and 0 hours : remove immediately"
 msgstr ""
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1707
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1710
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1750 src/prefs_account.c:2984
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1757
 msgid "Maximum number of articles to download"
 msgstr ""
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1767
 msgid "unlimited if 0 is specified"
 msgstr ""
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1792
 msgid "Plain text"
 msgstr ""
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1806
 msgid "IMAP server directory"
 msgstr ""
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1810
 msgid "(usually empty)"
 msgstr ""
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1824
 msgid "Show subscribed folders only"
 msgstr ""
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1831
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1833
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1840 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr ""
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1843
 msgid "Use global settings"
 msgstr ""
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1849 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr ""
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1888
 msgid "Filter messages on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1904
 msgid "Allow filtering using plugins on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1908
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: src/prefs_account.c:1998 src/prefs_customheader.c:210
 #: src/prefs_matcher.c:634 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr ""
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:2000
 msgid "Generate Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:2003
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:2006
 msgid "Add user agent header"
 msgstr ""
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:2013
 msgid "Add user-defined header"
 msgstr ""
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:2028
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2127
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2138
 msgid "Authenticate with POP before sending"
 msgstr ""
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2153
 msgid "POP authentication timeout"
 msgstr ""
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2233
+msgid "Authorization"
+msgstr "Authorisation"
+
+#: src/prefs_account.c:2250
+msgid "Select OAuth2 Email Service Provider"
+msgstr ""
+
+#: src/prefs_account.c:2290
+msgid "Client ID"
+msgstr ""
+
+#: src/prefs_account.c:2296
+msgid "Client secret"
+msgstr ""
+
+#: src/prefs_account.c:2328
+msgid "Obtain authorization code"
+msgstr "Obtain authorisation code"
+
+#: src/prefs_account.c:2332
+msgid "Open default browser with request"
+msgstr ""
+
+#: src/prefs_account.c:2338
+msgid "Copy link"
+msgstr ""
+
+#: src/prefs_account.c:2350
+msgid "Authorization code"
+msgstr "Authorisation code"
+
+#: src/prefs_account.c:2357
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+
+#: src/prefs_account.c:2364
+msgid "Complete authorization"
+msgstr "Complete authorisation"
+
+#: src/prefs_account.c:2368
+msgid "Authorize"
+msgstr "Authorise"
+
+#: src/prefs_account.c:2455 src/prefs_account.c:2501
 msgid "Signature"
 msgstr ""
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2458
 msgid "Automatically insert signature"
 msgstr ""
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2463
 msgid "Signature separator"
 msgstr ""
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2488
 msgid "Command output"
 msgstr ""
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2521
 msgid "Automatically set the following addresses"
 msgstr ""
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2573
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2583 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
+#: src/prefs_account.c:2596 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_account.c:2682 src/prefs_account.c:4158
 #: 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:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2697 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr ""
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: src/prefs_account.c:2712 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:2440
+#: src/prefs_account.c:2759
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2788 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2790 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr ""
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2792
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2795
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2798
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
-#: src/prefs_account.c:2481
+#: src/prefs_account.c:2800
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2958 src/prefs_account.c:2973 src/prefs_account.c:2987
 msgid "Don't use SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: src/prefs_account.c:2961 src/prefs_account.c:2976 src/prefs_account.c:2996
+#: src/prefs_account.c:3007
 msgid "Use SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2964 src/prefs_account.c:2979 src/prefs_account.c:3010
 msgid "Use STARTTLS command to start encrypted session"
 msgstr ""
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:3000
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:3004
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr ""
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:3015
 msgid "Client certificates"
 msgstr ""
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:3023
 msgid "Certificate for receiving"
 msgstr ""
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:3028 src/prefs_account.c:3030 src/prefs_account.c:3056
+#: src/prefs_account.c:3058
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr ""
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3051
 msgid "Certificate for sending"
 msgstr ""
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3091
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr ""
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3094
 msgid "Use non-blocking SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3106
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr ""
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3198 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr ""
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3207
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr ""
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3209
 msgid "Use global proxy server settings"
 msgstr ""
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3246 src/prefs_proxy.c:115 src/wizard.c:1120
 msgid "Use authentication"
 msgstr ""
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3251 src/prefs_proxy.c:123
 msgid "Username"
 msgstr ""
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3285
 msgid "Use proxy server for sending"
 msgstr ""
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3287
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
 msgstr ""
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3398
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3405
 msgid "POP port"
 msgstr ""
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3412
 msgid "IMAP port"
 msgstr ""
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3419
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3425
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3428
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3442
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3451
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3504
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3506
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3508
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3510
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3567
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3571
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3579
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3584
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3589
 msgid "POP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3609
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3615
 msgid "IMAP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3620
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3626
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3632
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3642
 msgid "User ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3647
 msgid "Password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3678
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3683
 msgid "SMTP password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3775
 msgid "domain is not specified."
 msgstr ""
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3780
 msgid "sent folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3785
 msgid "queue folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3790
 msgid "draft folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3795
 msgid "trash folder is not selected."
 msgstr "wastebin folder is not selected."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4104
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4140
+msgid "OAuth2"
+msgstr ""
+
+#: src/prefs_account.c:4176 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4194
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4324
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4679
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4681
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4800 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4885
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4903 src/prefs_account.c:4920 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:5016
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5333
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
@@ -14210,7 +14485,7 @@ msgid ""
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
 
-#: src/prefs_common.c:451
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr ""
 
@@ -14432,8 +14707,8 @@ msgid ""
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:351
+#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:180
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr ""
 
@@ -14956,27 +15231,43 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:76
 msgid "Automatically display attached images"
 msgstr ""
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:82
 msgid "Resize attached images by default"
 msgstr ""
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:85
 msgid "Clicking image toggles scaling"
 msgstr ""
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:96
+msgid "Fit image"
+msgstr ""
+
+#: src/prefs_image_viewer.c:99
+msgid "Right-clicking image toggles fitting height/width"
+msgstr ""
+
+#: src/prefs_image_viewer.c:102
+msgid "Height"
+msgstr ""
+
+#: src/prefs_image_viewer.c:107
+msgid "Width"
+msgstr ""
+
+#: src/prefs_image_viewer.c:114
 msgid "Display images inline"
 msgstr ""
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:120
 msgid "Print images"
 msgstr ""
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:181
 msgid "Image Viewer"
 msgstr ""
 
@@ -15168,11 +15459,11 @@ msgstr ""
 msgid "whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:403 src/summaryview.c:6563
 msgid "Marked"
 msgstr ""
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:404 src/summaryview.c:6561
 msgid "Deleted"
 msgstr ""
 
@@ -15180,11 +15471,11 @@ msgstr ""
 msgid "Replied"
 msgstr ""
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:406 src/summaryview.c:6555
 msgid "Forwarded"
 msgstr ""
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:408 src/summaryview.c:6545 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr ""
@@ -15193,7 +15484,7 @@ msgstr ""
 msgid "Has attachment"
 msgstr ""
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:410 src/summaryview.c:6581
 msgid "Signed"
 msgstr ""
 
@@ -15461,83 +15752,91 @@ msgstr ""
 msgid "Current condition rules"
 msgstr ""
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr ""
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr ""
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr ""
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr ""
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr ""
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr ""
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr ""
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr ""
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr ""
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr ""
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr ""
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr ""
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr ""
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr ""
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr ""
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr ""
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr ""
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr ""
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr ""
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr ""
 
@@ -16172,8 +16471,8 @@ msgid ""
 "characters"
 msgstr ""
 
-#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
-#: src/send_message.c:529
+#: src/prefs_send.c:420 src/send_message.c:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr ""
 
@@ -16952,7 +17251,7 @@ msgstr ""
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
-#: src/procmime.c:2755
+#: src/procmime.c:2758
 msgid "Could not decode part"
 msgstr ""
 
@@ -17271,88 +17570,88 @@ msgstr ""
 msgid "Enter variable"
 msgstr ""
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr ""
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr ""
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr ""
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr ""
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr ""
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr ""
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr ""
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr ""
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr ""
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr ""
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr ""
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr ""
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr ""
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr ""
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr ""
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr ""
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17645,173 +17944,173 @@ msgstr ""
 msgid "To: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4484
 msgid "You're not the author of the article."
 msgstr ""
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4574
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4577
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4741
 msgid "Destination is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4796
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4847
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4881
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5039
 msgid "Append or Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5040
 msgid "Append or overwrite existing file?"
 msgstr ""
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Append"
 msgstr ""
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5041
 msgid "_Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5052 src/summaryview.c:5055 src/summaryview.c:5070
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5090
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5548
 msgid "Building threads..."
 msgstr ""
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5796
 msgid "Skip these rules"
 msgstr ""
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5799
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5802
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5831
 msgid "Filtering"
 msgstr ""
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5832
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5864
 msgid "Filtering..."
 msgstr ""
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5947
 msgid "Processing configuration"
 msgstr ""
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6095
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Do you really want to reset the colour label of all selected messages?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6097
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Do you really want to apply this colour label to all selected messages?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Reset color label"
 msgstr "Reset colour label"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6098
 msgid "Set color label"
 msgstr "Set colour label"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6541
 msgid "Ignored thread"
 msgstr ""
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6543
 msgid "Watched thread"
 msgstr ""
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6551
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6553
 msgid "Replied - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6565
 msgid "To be moved"
 msgstr ""
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6567
 msgid "To be copied"
 msgstr ""
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6579
 msgid "Signed, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6583
 msgid "Encrypted, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6585
 msgid "Encrypted"
 msgstr ""
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6587
 msgid "Has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8299
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8402
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8407
 msgid "Go back to the folder list"
 msgstr ""
 

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list