accountrc, clawsrc, menurc: Update to Claws 3.14.1

Claws commit 3.13.2-180-g3b5b4f7 added "config_version" (set to 0).

Commits 3.13.2-181-g358e811 and 3.13.2-182-g6bc99f8 removed APOP and
RPOP account protocols, decremented IMAP (ID 3) and higher protocol IDs
by 2, and bumped "config_version" to 1.

Commit 3.13.2-197-gbc779dc raised "autochk_interval" granularity from
minutes to seconds and bumped "config_version" to 2.

3.13.2-63-g2a6f8d1, 3.13.2-64-gcaa44e5, and later commits implemented
and began using a password store, instead of storing passwords in
account preferences.

3.13.2-139-ga451a77 removed the "imap_use_trash" account preference, due
to bugs when set to 0.

Commits 3.12.0-78-g9524293 and 3.12.0-82-g02c24e9 added
"default_sort_key" and "default_sort_type".  See also
3.12.0-91-g307fff3.

The following hidden preferences were added by the following commits:

  * "rewrite_first_from": 3.14.0-94-ge070e40
  * "hide_timezone": 3.14.0-22-g3a89a27 and 3.14.0-23-gf4e8599
  * "type_any_header": 3.12.0-44-g5ef1df1
  * "next_on_delete": 3.13.2-165-g92c1a19

3 files changed, 27 insertions, 137 deletions

diff --git a/.claws-mail/accountrc b/.claws-mail/accountrc
index bcbd7ca..d207a02 100644
--- a/.claws-mail/accountrc
+++ b/.claws-mail/accountrc
@@ -4,7 +4,7 @@ is_default=1
 name=Patrick 'P. J.' McDermott
 address=pj@pehjota.net
 organization=
-protocol=3
+protocol=1
 receive_server=mail.pehjota.net
 smtp_server=mail.pehjota.net
 nntp_server=
@@ -14,7 +14,6 @@ mail_command=/usr/sbin/sendmail -t -i
 use_nntp_auth=0
 use_nntp_auth_onconnect=0
 user_id=pj
-password=!
 use_apop_auth=0
 remove_mail=1
 message_leave_time=7
@@ -38,7 +37,6 @@ msgid_with_addr=0
 use_smtp_auth=0
 smtp_auth_method=0
 smtp_user_id=
-smtp_password=!
 pop_before_smtp=0
 pop_before_smtp_timeout=5
 signature_type=0
@@ -79,9 +77,7 @@ ssl_smtp=0
 ssl_certs_auto_accept=0
 use_nonblocking_ssl=1
 in_ssl_client_cert_file=
-in_ssl_client_cert_pass=!
 out_ssl_client_cert_file=
-out_ssl_client_cert_pass=!
 set_smtpport=0
 smtp_port=25
 set_popport=0
@@ -106,7 +102,6 @@ set_draft_folder=0
 draft_folder=
 set_trash_folder=0
 trash_folder=
-imap_use_trash=1
 
 [Account: 2]
 account_name=patrick.mcdermott@libiquity.com
@@ -114,7 +109,7 @@ is_default=0
 name=Patrick McDermott
 address=patrick.mcdermott@libiquity.com
 organization=Libiquity LLC
-protocol=3
+protocol=1
 receive_server=mail.libiquity.com
 smtp_server=mail.libiquity.com
 nntp_server=
@@ -124,7 +119,6 @@ mail_command=/usr/sbin/sendmail -t -i
 use_nntp_auth=0
 use_nntp_auth_onconnect=0
 user_id=patrick.mcdermott
-password=!
 use_apop_auth=0
 remove_mail=1
 message_leave_time=7
@@ -148,7 +142,6 @@ msgid_with_addr=0
 use_smtp_auth=0
 smtp_auth_method=0
 smtp_user_id=
-smtp_password=!
 pop_before_smtp=0
 pop_before_smtp_timeout=5
 signature_type=0
@@ -189,9 +182,7 @@ ssl_smtp=0
 ssl_certs_auto_accept=0
 use_nonblocking_ssl=1
 in_ssl_client_cert_file=
-in_ssl_client_cert_pass=!
 out_ssl_client_cert_file=
-out_ssl_client_cert_pass=!
 set_smtpport=0
 smtp_port=25
 set_popport=0
@@ -216,7 +207,6 @@ set_draft_folder=0
 draft_folder=
 set_trash_folder=0
 trash_folder=
-imap_use_trash=1
 
 [Account: 3]
 account_name=sales@libiquity.com
@@ -224,7 +214,7 @@ is_default=0
 name=Libiquity
 address=sales@libiquity.com
 organization=Libiquity LLC
-protocol=6
+protocol=4
 receive_server=
 smtp_server=mail.libiquity.com
 nntp_server=
@@ -234,7 +224,6 @@ mail_command=/usr/sbin/sendmail -t -i
 use_nntp_auth=0
 use_nntp_auth_onconnect=0
 user_id=pj
-password=!
 use_apop_auth=0
 remove_mail=1
 message_leave_time=7
@@ -258,7 +247,6 @@ msgid_with_addr=0
 use_smtp_auth=0
 smtp_auth_method=0
 smtp_user_id=
-smtp_password=!
 pop_before_smtp=0
 pop_before_smtp_timeout=5
 signature_type=0
@@ -299,9 +287,7 @@ ssl_smtp=0
 ssl_certs_auto_accept=0
 use_nonblocking_ssl=1
 in_ssl_client_cert_file=
-in_ssl_client_cert_pass=!
 out_ssl_client_cert_file=
-out_ssl_client_cert_pass=!
 set_smtpport=0
 smtp_port=25
 set_popport=0
@@ -326,4 +312,3 @@ set_draft_folder=1
 draft_folder=#imap/patrick.mcdermott@libiquity.com/Drafts
 set_trash_folder=1
 trash_folder=#imap/patrick.mcdermott@libiquity.com/Trash
-imap_use_trash=1
diff --git a/.claws-mail/clawsrc b/.claws-mail/clawsrc
index 7e7235d..1ac6085 100644
--- a/.claws-mail/clawsrc
+++ b/.claws-mail/clawsrc
@@ -1,8 +1,9 @@
 [Common]
+config_version=2
 use_ext_inc=0
 ext_inc_path=/usr/bin/mh/inc
 autochk_newmail=1
-autochk_interval=10
+autochk_interval=600
 check_on_startup=1
 open_inbox_on_inc=0
 scan_all_after_inc=0
@@ -22,7 +23,9 @@ sendwin_height=250
 outgoing_charset=AUTO
 encoding_method=0
 outgoing_fallback_to_ascii=1
+rewrite_first_from=1
 warn_empty_subj=1
+hide_timezone=0
 allow_jisx0201_kana=0
 auto_ext_editor=0
 forward_as_attachment=0
@@ -32,6 +35,7 @@ compose_with_format=0
 compose_subject_format=
 compose_body_format=Hello,\n
 show_compose_margin=0
+type_any_header=0
 linewrap_length=72
 linewrap_quotation=0
 linewrap_pastes=1
@@ -112,10 +116,13 @@ inline_image=1
 display_folder_unread_num=0
 newsgroup_abbrev_len=16
 translate_header=0
+default_sort_key=3
+default_sort_type=1
 use_address_book=0
 thread_by_subject=0
 date_format=%Y-%m-%d (%a) %H:%M
 msgview_date_format=0
+next_on_delete=0
 bold_unread=1
 enable_thread=1
 toolbar_style=3
@@ -162,7 +169,7 @@ summary_col_size_tags=150
 folderwin_x=16
 folderwin_y=16
 folderview_width=297
-folderview_height=631
+folderview_height=833
 folderview_visible=1
 folder_col_show_folder=1
 folder_col_show_new=1
@@ -177,11 +184,11 @@ folder_col_size_new=25
 folder_col_size_unread=40
 folder_col_size_total=32
 summaryview_width=974
-summaryview_height=335
+summaryview_height=443
 main_messagewin_x=256
 main_messagewin_y=210
 messageview_width=974
-messageview_height=291
+messageview_height=385
 messageview_visible=1
 mainview_x=64
 mainview_y=64
@@ -397,6 +404,10 @@ diff_hunk_color=#a52a2a
 folder_search_wildcard=1
 address_search_wildcard=1
 enable_avatars=3
+use_master_passphrase=0
+master_passphrase=
+master_passphrase_salt=
+master_passphrase_pbkdf2_rounds=50000
 
 [Plugins_Common]
 
@@ -421,6 +432,7 @@ stylesheet=
 [GPG]
 auto_check_signatures=1
 autocompletion=0
+autocompletion_limit=0
 use_gpg_agent=1
 store_passphrase=0
 store_passphrase_timeout=0
@@ -428,4 +440,5 @@ passphrase_grab=0
 gpg_warning=1
 gpg_ask_create_key=0
 skip_encryption_warning=pgpmime,
+gpg_path=
 
diff --git a/.claws-mail/menurc b/.claws-mail/menurc
index 6f2b91a..78cd211 100644
--- a/.claws-mail/menurc
+++ b/.claws-mail/menurc
@@ -9,6 +9,7 @@
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/DeleteFolder" "")
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/DownloadMessages" "")
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/MarkAllRead" "")
+; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/MarkAllReadRec" "")
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/MoveFolder" "")
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Processing" "")
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Properties" "")
@@ -21,10 +22,6 @@
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Subscriptions/Subscribe" "")
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Subscriptions/Unsubscribe" "")
 ; (gtk_accel_path "<Actions>/<IMAPFolder>/FolderViewPopup/Synchronise" "")
-; (gtk_accel_path "<Actions>/Menu/Compose" "")
-; (gtk_accel_path "<Actions>/Menu/Compose/Add" "")
-; (gtk_accel_path "<Actions>/Menu/Compose/Properties" "")
-; (gtk_accel_path "<Actions>/Menu/Compose/Remove" "")
 ; (gtk_accel_path "<Actions>/Menu/Configuration" "")
 ; (gtk_accel_path "<Actions>/Menu/Configuration/AccountPrefs" "")
 ; (gtk_accel_path "<Actions>/Menu/Configuration/Actions" "")
@@ -43,45 +40,15 @@
 ; (gtk_accel_path "<Actions>/Menu/Configuration/Tags" "")
 ; (gtk_accel_path "<Actions>/Menu/Configuration/Templates" "")
 ; (gtk_accel_path "<Actions>/Menu/Edit" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/BackChar" "<Primary><Shift>b")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/BackWord" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/BegLine" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelBackChar" "<Primary>h")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelBackWord" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelEndLine" "<Primary>k")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelForwChar" "<Primary>d")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelForwWord" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/DelLine" "<Primary>u")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/EndLine" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/ForwChar" "<Primary><Shift>f")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/ForwWord" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/NextLine" "<Primary>n")
-; (gtk_accel_path "<Actions>/Menu/Edit/Advanced/PrevLine" "<Primary>p")
-; (gtk_accel_path "<Actions>/Menu/Edit/AutoIndent" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/AutoWrap" "<Primary><Shift>l")
 ; (gtk_accel_path "<Actions>/Menu/Edit/Copy" "<Primary>c")
-; (gtk_accel_path "<Actions>/Menu/Edit/Cut" "<Primary>x")
-; (gtk_accel_path "<Actions>/Menu/Edit/DeleteThread" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/ExtEditor" "<Primary><Shift>x")
 ; (gtk_accel_path "<Actions>/Menu/Edit/Find" "<Primary>f")
-; (gtk_accel_path "<Actions>/Menu/Edit/Paste" "<Primary>v")
 ; (gtk_accel_path "<Actions>/Menu/Edit/QuickSearch" "slash")
-; (gtk_accel_path "<Actions>/Menu/Edit/Redo" "<Primary>y")
 ; (gtk_accel_path "<Actions>/Menu/Edit/SearchFolder" "<Primary><Shift>f")
 ; (gtk_accel_path "<Actions>/Menu/Edit/SelectAll" "<Primary>a")
 ; (gtk_accel_path "<Actions>/Menu/Edit/SelectThread" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/SpecialPaste" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/SpecialPaste/AsQuotation" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/SpecialPaste/Unwrapped" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/SpecialPaste/Wrapped" "")
-; (gtk_accel_path "<Actions>/Menu/Edit/Undo" "<Primary>z")
-; (gtk_accel_path "<Actions>/Menu/Edit/WrapAllLines" "<Primary><Alt>l")
-; (gtk_accel_path "<Actions>/Menu/Edit/WrapPara" "<Primary>l")
 ; (gtk_accel_path "<Actions>/Menu/File" "")
 ; (gtk_accel_path "<Actions>/Menu/File/AddMailbox" "")
 ; (gtk_accel_path "<Actions>/Menu/File/AddMailbox/MH" "")
-; (gtk_accel_path "<Actions>/Menu/File/Close" "<Primary>w")
 ; (gtk_accel_path "<Actions>/Menu/File/EmptyTrashes" "<Shift>d")
 ; (gtk_accel_path "<Actions>/Menu/File/Exit" "<Primary>q")
 ; (gtk_accel_path "<Actions>/Menu/File/ExportMbox" "")
@@ -100,22 +67,18 @@
 ; (gtk_accel_path "<Actions>/Menu/Help/IconLegend" "")
 ; (gtk_accel_path "<Actions>/Menu/Help/Manual" "")
 ; (gtk_accel_path "<Actions>/Menu/Message" "")
-; (gtk_accel_path "<Actions>/Menu/Message/AttachFile" "<Primary>m")
 ; (gtk_accel_path "<Actions>/Menu/Message/CancelNews" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/CancelSending" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/CheckSignature" "c")
-; (gtk_accel_path "<Actions>/Menu/Message/Close" "<Primary>w")
 ; (gtk_accel_path "<Actions>/Menu/Message/ColorLabel" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/ComposeEmail" "<Primary>m")
 ; (gtk_accel_path "<Actions>/Menu/Message/ComposeNews" "")
-; (gtk_accel_path "<Actions>/Menu/Message/Compose" "<Primary>m")
 ; (gtk_accel_path "<Actions>/Menu/Message/Copy" "<Primary><Shift>o")
 ; (gtk_accel_path "<Actions>/Menu/Message/Delete" "")
+; (gtk_accel_path "<Actions>/Menu/Message/DeleteThread" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/FollowupReply" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/ForwardAtt" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Forward" "<Primary><Alt>f")
-; (gtk_accel_path "<Actions>/Menu/Message/InsertFile" "<Primary>i")
-; (gtk_accel_path "<Actions>/Menu/Message/InsertSig" "<Primary>g")
 ; (gtk_accel_path "<Actions>/Menu/Message/MailingList" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/MailingList/ContactOwner" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/MailingList/ContactOwner/PlaceHolder" "")
@@ -144,7 +107,6 @@
 ; (gtk_accel_path "<Actions>/Menu/Message/Mark/UnwatchThread" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Mark/WatchThread" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Move" "<Primary>o")
-; (gtk_accel_path "<Actions>/Menu/Message/Print" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Receive" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Receive/AllAccounts" "<Primary><Shift>i")
 ; (gtk_accel_path "<Actions>/Menu/Message/Receive/CancelReceiving" "")
@@ -152,84 +114,15 @@
 ; (gtk_accel_path "<Actions>/Menu/Message/Receive/PlaceHolder" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Redirect" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Reedit" "")
-; (gtk_accel_path "<Actions>/Menu/Message/ReplaceSig" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Reply" "<Primary>r")
 ; (gtk_accel_path "<Actions>/Menu/Message/ReplyTo" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/ReplyTo/All" "<Primary><Shift>r")
 ; (gtk_accel_path "<Actions>/Menu/Message/ReplyTo/List" "<Primary>l")
 ; (gtk_accel_path "<Actions>/Menu/Message/ReplyTo/Sender" "")
-; (gtk_accel_path "<Actions>/Menu/Message/Save" "<Primary>s")
-; (gtk_accel_path "<Actions>/Menu/Message/SendLater" "<Primary><Shift>s")
-; (gtk_accel_path "<Actions>/Menu/Message/Send" "<Primary>Return")
 ; (gtk_accel_path "<Actions>/Menu/Message/SendQueue" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Tags" "")
 ; (gtk_accel_path "<Actions>/Menu/Message/Trash" "<Primary>d")
-; (gtk_accel_path "<Actions>/Menu/Options" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Arabic" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Arabic/ISO-8859-6" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Arabic/Windows-1256" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/AUTO" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Baltic" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Baltic/ISO-8859-13" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Baltic/ISO-8859-4" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/Big5" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/EUC-TW" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/GB18030" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/GB2312" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Chinese/GBK" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Cyrillic" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Cyrillic/ISO-8859-5" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Cyrillic/KOI8-R" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Cyrillic/KOI8-U" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Cyrillic/Windows-1251" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Hebrew" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Hebrew/ISO-8859-8" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Hebrew/Windows-1255" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/ISO-8859-2" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/ISO-8859-7" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/ISO-8859-9" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Japanese" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Japanese/EUC-JP" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Japanese/ISO-2022-JP" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Japanese/ISO-2022-JP-2" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Japanese/Shift_JIS" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Korean" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Korean/EUC-KR" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Korean/ISO-2022-KR" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Thai" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Thai/TIS-620" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Thai/Windows-874" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/US-ASCII" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/UTF-8" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Western" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Western/ISO-8859-1" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Western/ISO-8859-15" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encoding/Western/Windows-1252" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Encrypt" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Priority" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Priority/High" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Priority/Highest" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Priority/Low" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Priority/Lowest" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Priority/Normal" "")
-; (gtk_accel_path "<Actions>/Menu/Options/PrivacySystem" "")
-; (gtk_accel_path "<Actions>/Menu/Options/PrivacySystem/PlaceHolder" "")
-; (gtk_accel_path "<Actions>/Menu/Options/RemoveReferences" "")
-; (gtk_accel_path "<Actions>/Menu/Options/ReplyMode" "")
-; (gtk_accel_path "<Actions>/Menu/Options/ReplyMode/All" "")
-; (gtk_accel_path "<Actions>/Menu/Options/ReplyMode/List" "")
-; (gtk_accel_path "<Actions>/Menu/Options/ReplyMode/Normal" "")
-; (gtk_accel_path "<Actions>/Menu/Options/ReplyMode/Sender" "")
-; (gtk_accel_path "<Actions>/Menu/Options/RequestRetRcpt" "")
-; (gtk_accel_path "<Actions>/Menu/Options/Sign" "")
-; (gtk_accel_path "<Actions>/Menu/Spelling" "")
-; (gtk_accel_path "<Actions>/Menu/Spelling/CheckAllSel" "")
-; (gtk_accel_path "<Actions>/Menu/Spelling/CheckBackwards" "")
-; (gtk_accel_path "<Actions>/Menu/Spelling/ForwardNext" "")
-; (gtk_accel_path "<Actions>/Menu/Spelling/HighlightAll" "")
-; (gtk_accel_path "<Actions>/Menu/Spelling/Options" "")
+; (gtk_accel_path "<Actions>/Menu/Message/TrashThread" "")
 ; (gtk_accel_path "<Actions>/Menu/SummaryViewPopup" "")
 ; (gtk_accel_path "<Actions>/Menu/SummaryViewPopup/ColorLabel" "")
 ; (gtk_accel_path "<Actions>/Menu/SummaryViewPopup/CreateFilterRule" "")
@@ -265,14 +158,12 @@
 ; (gtk_accel_path "<Actions>/Menu/Tools/FilterFolder" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/FilteringLog" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/FilterSelected" "")
+; (gtk_accel_path "<Actions>/Menu/Tools/ForgetMasterPassphrase" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/ForgetSessionPasswords" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/ListUrls" "<Primary><Shift>u")
 ; (gtk_accel_path "<Actions>/Menu/Tools/NetworkLog" "<Primary><Shift>l")
 ; (gtk_accel_path "<Actions>/Menu/Tools/RunProcessing" "")
-; (gtk_accel_path "<Actions>/Menu/Tools/ShowRuler" "")
 ; (gtk_accel_path "<Actions>/Menu/Tools/SSLCertificates" "")
-; (gtk_accel_path "<Actions>/Menu/Tools/Template" "")
-; (gtk_accel_path "<Actions>/Menu/Tools/Template/PlaceHolder" "")
 ; (gtk_accel_path "<Actions>/Menu/View" "")
 ; (gtk_accel_path "<Actions>/Menu/View/AllHeaders" "<Primary>h")
 ; (gtk_accel_path "<Actions>/Menu/View/CollapseThreads" "")
@@ -300,6 +191,7 @@
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Cyrillic/ISO-8859-5" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Cyrillic/KOI8-R" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Cyrillic/KOI8-U" "")
+; (gtk_accel_path "<Actions>/Menu/View/Encoding/Cyrillic/Mac-Cyrillic" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Cyrillic/Windows-1251" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Hebrew" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Encoding/Hebrew/ISO-8859-8" "")
@@ -327,6 +219,7 @@
 ; (gtk_accel_path "<Actions>/Menu/View/ExpandThreads" "")
 ; (gtk_accel_path "<Actions>/Menu/View/FullScreen" "F11")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto" "")
+; (gtk_accel_path "<Actions>/Menu/View/Goto/Folder" "g")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/NextHistory" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/NextLabeled" "")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/NextMarked" "")
@@ -335,7 +228,6 @@
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/NextPart" "a")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/NextUnreadFolder" "<Shift>g")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/NextUnread" "<Shift>n")
-; (gtk_accel_path "<Actions>/Menu/View/Goto/OtherFolder" "g")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/ParentMessage" "<Primary>Up")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/PrevHistory" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/Menu/View/Goto/PrevLabeled" "")
@@ -373,7 +265,7 @@
 ; (gtk_accel_path "<Actions>/Menu/View/SetColumns/Messagelist" "")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide" "")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide/ColumnHeaders" "")
-; (gtk_accel_path "<Actions>/Menu/View/ShowHide/MenuBar" "F12")
+; (gtk_accel_path "<Actions>/Menu/View/ShowHide/MenuBar" "<Primary>F12")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide/MessageView" "v")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide/StatusBar" "")
 ; (gtk_accel_path "<Actions>/Menu/View/ShowHide/Toolbar" "")