2 files changed, 11 insertions, 7 deletions

diff --git a/muttrc b/muttrc
index 2f902d8..4aa56d2 100644
--- a/muttrc
+++ b/muttrc
@@ -31,8 +31,9 @@ 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
+set timeout = 10
+set quit = ask-no
+set sort = threads
 
 # 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
@@ -49,7 +50,8 @@ bind pager \cj next-entry
 bind pager \ck previous-entry
 bind index g noop
 bind index gg first-entry
-bind index l select-entry
+#bind index l select-entry
+bind index <Return> sync-mailbox
 bind index \cl limit
 bind index G last-entry
 bind index R group-reply
@@ -61,6 +63,7 @@ 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"
+macro index <Return> ":exec sync-mailbox sidebar-open\n" "Sync Mailbox"
 
 # Sidebar
 mailboxes =INBOX =mbox =pay =Sent =Trash =Drafts =talk-tw =service =keep
diff --git a/vimrc b/vimrc
index 5fd757e..fee8438 100644
--- a/vimrc
+++ b/vimrc
@@ -88,6 +88,7 @@ vnoremap { <ESC>`<i{<ESC>`>la}<ESC>
 vnoremap [ <ESC>`<i[<ESC>`>la]<ESC>
 vnoremap ` <ESC>`<i`<ESC>`>la`<ESC>
 vnoremap , <ESC>`<i<<ESC>`>la><ESC>
+vnoremap <space> <ESC>`<i<space><ESC>`>la<space><ESC>
 vnoremap 8 <ESC>`<i*<ESC>`>la*<ESC>
 vnoremap z <ESC>`<i「<ESC>`>la」<ESC>
 
@@ -153,10 +154,10 @@ nnoremap <leader>I :s/^[ ]*- \(\[.\] \)*//<CR>
 nmap <leader>D dd:VimwikiMakeDiaryNote<CR>Gp:w!<CR>:Bclose<CR>
 vnoremap <leader>D d:VimwikiMakeDiaryNote<CR>Gp:w!<CR>
 let g:vimwiki_list = [{
-    'path': '~/vimwiki/', 
-    'syntax': 'markdown', 
-    'ext': '.md'
-}]
+    \ 'path': '~/vimwiki/', 
+    \ 'syntax': 'markdown', 
+    \ 'ext': '.md',
+    \ }]
 
 " Git push quietly whenever leaving vim with VimWiki files
 augroup vimwikiPush