1 files changed, 13 insertions, 7 deletions

diff --git a/muttrc b/muttrc
index 11db2bd..5620b62 100644
--- a/muttrc
+++ b/muttrc
@@ -18,8 +18,8 @@ set postponed = "+Drafts"
 
 set pgp_use_gpg_agent=yes
 set crypt_use_gpgme=yes
-# replace D21D8761 with your gpg key id
 set pgp_timeout=300
+# replace 6DD8C14A with your gpg key id
 set pgp_sign_as=6DD8C14A
 
 subscribe talk-tw@openstreetmap.org
@@ -30,6 +30,8 @@ set send_charset = "us-ascii:utf-8"
 set header = no
 set pager_stop
 set sleep_time=0 # When changing folder
+set timeout=10
+set quit=ask-no
 
 # Vim-style key binding, \c means Ctrl
 # ref: https://fancyseeker.github.io/2015/08/19/mutt/#vim%E9%A3%8E%E6%A0%BC%E9%94%AE%E4%BD%8D%E7%BB%91%E5%AE%9A
@@ -50,7 +52,6 @@ bind index l select-entry
 bind index \cl limit
 bind index G last-entry
 bind index R group-reply
-bind index q change-folder
 bind index \cf next-page
 bind index \cb previous-page
 bind index \cd half-down
@@ -58,17 +59,22 @@ bind index \cu half-up
 bind index } bottom-page
 bind index x tag-entry
 bind attach x view-mailcap
+macro generic,index,pager \cr ":source ~/.config/mutt/muttrc\n" "Reload mutt's configuration file"
 
 # Sidebar
-mailboxes =INBOX =mbox =Sent =Trash =Drafts =talk-tw =pay =service
+mailboxes =INBOX =mbox =pay =Sent =Trash =Drafts =talk-tw =service =keep
+set mail_check_stats
+set imap_check_subscribed = yes
+set imap_list_subscribed = yes
 set sidebar_visible = yes
 set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S'
 set sidebar_short_path = yes
-set sidebar_sort_method = 'new'
 bind index,pager B sidebar-toggle-visible
-bind index \Cp sidebar-prev
-bind index \Cn sidebar-next
-bind index \Co sidebar-open
+bind index,pager \Cp sidebar-prev
+bind index,pager \Cn sidebar-next
+bind index,pager \Co sidebar-open
+bind index,pager <F5> sidebar-prev-new
+bind index,pager <F6> sidebar-next-new
 color indicator cyan black
 color sidebar_highlight black color8
 color sidebar_divider color8 black