diff --git a/dot_muttrc b/dot_muttrc
index 3ff7e85..0a04e1c 100644
--- a/dot_muttrc
+++ b/dot_muttrc
@@ -4,17 +4,47 @@
 set from  = chris@cowley.tech
 set real_name = "Chris Cowley"
 
-set pager_index_lines = 6   # show this many lines of the Index when
-                            # reading email
-set pager_context = 3       # lines of context between pages
-set pager_stop = yes        # don't scroll of the end of one message onto
-                            # the next
 set edit_headers = yes    # allow user to edit message headers
-set editor       = "vim"  # define which editor to use
-
+set editor       = "nvim"  # define which editor to use
 set fast_reply   = yes    # skip initial prompts when replying
 set include      = yes    # include the message we're replying to
+set askcc                            # ask for CC:
+set fcc_attach                       # save attachments with the body
+set forward_format = "Fwd: %s"       # format of subject when forwarding
+set forward_decode                   # decode when forwarding
+set attribution = "On %d, %n wrote:" # format of quoting header
+set reply_to                         # reply to Reply to: field
+set reverse_name                     # reply as whomever it was to
+set include                          # include message in replies
+set forward_quote                    # include message in forwards
+set text_flowed
+unset sig_dashes                     # no dashes before sig
+unset mime_forward                   # forward attachments as part of body
 
+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_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
+set sort_aux = reverse-last-date-received
+set uncollapse_jump
+set sort_re
+set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
+set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
+set send_charset = "utf-8:iso-8859-1:us-ascii"
+set charset = "utf-8"
+set arrow_cursor = "no" # Change `color indicator` depending
+
+# Pager View Options
+set pager_index_lines = 10  # Shows 10 lines of index when pager is active
+set pager_context = 3
+set pager_stop
+set menu_scroll
+set tilde
+unset markers
 
 ### save and sync my sent messages
 set record=~/Maildir/Sent
@@ -32,7 +62,7 @@ mailboxes =INBOX \
 =Drafts \
 =Trash
 
-set sidebar_visible
+#set sidebar_visible
 set sidebar_format = "%B%<F? [%F]>%* %<N?%N/>%S"
 set sidebar_next_new_wrap = yes  # wrap around the list when scrolling
 set mail_check_stats