Minor modifications/updates to mutt settings/mappings

2 files changed, 16 insertions, 15 deletions

diff --git a/.config/neomutt/mappings b/.config/neomutt/mappings
index 2e29117..6ca2e47 100644
--- a/.config/neomutt/mappings
+++ b/.config/neomutt/mappings
@@ -1,18 +1,19 @@
 # vim: filetype=neomuttrc
 
 bind index,pager,attach g noop
-macro index,pager gi "<change-folder>=INBOX<enter>"             "open inbox"
-macro index,pager gd "<change-folder>=Drafts<enter>"            "open drafts"
-macro index,pager gs "<change-folder>=Sent Messages<enter>"     "open sent"
-macro index,pager gt "<change-folder>=Deleted Messages<enter>"  "open trash"
-macro index,pager gf "<change-folder>?"                         "open mailbox..."
+macro index,pager gi "<change-folder>+INBOX<enter>"               "open inbox"
+macro index,pager gd "<change-folder>+Drafts<enter>"              "open drafts"
+macro index,pager gs "<change-folder>+Sent%20Messages<enter>"     "open sent"
+macro index,pager gt "<change-folder>+Deleted%20Messages<enter>"  "open trash"
+macro index,pager gf "<change-folder>?"                           "open mailbox..."
+
+bind index,pager j next-undeleted
+bind index,pager k previous-undeleted
+
+bind pager J next-line
+bind pager K previous-line
 
 bind index,pager \CJ sidebar-next
 bind index,pager \CK sidebar-prev
-bind index,pager \CE sidebar-open
-bind index,pager B sidebar-toggle-visible
-
-# Attach PGP public key
-bind compose a noop
-bind compose aa attach-file
-macro compose ap "<attach-key>`echo [email protected]`<enter><enter>" "attach public key"
+bind index,pager \Co sidebar-open
+bind index,pager \Cb sidebar-toggle-visible
diff --git a/.config/neomutt/settings b/.config/neomutt/settings
index faf003d..2d9ec83 100644
--- a/.config/neomutt/settings
+++ b/.config/neomutt/settings
@@ -35,7 +35,7 @@ set reverse_name                        # reply as the origin To
 set include                             # include message in replies
 set forward_quote                       # include message in forwards
 unset text_flowed                       # don't genreate text/plain; format=flowed
-# unset sig_dashes                        # no dashes before sig
+unset sig_dashes                        # no dashes before sig
 unset mime_forward                      # forward attachments as part of body
 # unset help                              # No help bar at the top of index
 set status_on_top                       # Status bar on top of index
@@ -49,7 +49,7 @@ set pipe_decode          # strip headers and eval mimes when piping
 set thorough_search      # strip headers and eval mimes before searching
 
 # status bar, date format, finding stuff etc.
-# set status_chars = " *%A"
+set status_chars = " *%A"
 set status_format = "[ Folder: %f ] [%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]%>─%?p?( %p postponed )?"
 set date_format = "%d.%m.%Y %H:%M"
 set sort = threads
@@ -57,7 +57,7 @@ set sort_aux = last-date-received             # New mail is added at the bottom
 set sort_aux = reverse-last-date-received     # Override the sort_aux so that new always come first/top
 # set uncollapse_jump
 set sort_re
-set reply_regex = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
+set reply_regex = "^((re|aw|sv|fwd?|fw)([\\[0-9\\]]+)?:[ \t]*)*"
 # set quote_regex = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 set send_charset = "utf-8:iso-8859-1:us-ascii"
 set charset = "utf-8"