diff --git a/email/.config/neomutt/mailcap b/email/.config/neomutt/mailcap
index 2da15a0..3692d80 100644
--- a/email/.config/neomutt/mailcap
+++ b/email/.config/neomutt/mailcap
@@ -1,2 +1,2 @@
-text/html; $BROWSER %s
+text/html; w3m -sixel -o confirm_qq=false -o auto_image=TRUE -o display_image=1 -T text/html %s; nametemplate=%s.html; needsterminal
 text/html; w3m -I %{charset} -T text/html -dump; copiousoutput;
diff --git a/email/.config/neomutt/neomuttrc b/email/.config/neomutt/neomuttrc
index 5fa38d6..dd88037 100644
--- a/email/.config/neomutt/neomuttrc
+++ b/email/.config/neomutt/neomuttrc
@@ -4,16 +4,20 @@ set realname = "Andrew Davidson"
 
 
 #### Remote Connectivity
+set imap_user = "andrew@amd.im"
+set imap_pass = "`pass show email/amd.im/andrew`"
+set smtp_url = "smtps://$imap_user:$imap_pass@mail.amd.im:465"
+
+
+#### Remote email store
 #### use this instead of the local storage section below.
-#set imap_user = "andrew@amd.im"
-#set imap_pass = "`pass show email/amd.im/andrew`"
 #set folder = "imaps://mail.amd.im"
-#set smtp_url = "smtps://$imap_user:$imap_pass@mail.amd.im:465"
 #set ssl_starttls = no
 #set ssl_force_tls = yes
 #set imap_check_subscribed           # automatically check subscribed folders
 #mailboxes +INBOX
 
+
 #### Local storage of emails
 #### Use this with isync/mbsync to store email locally
 set mbox_type = Maildir
@@ -22,7 +26,7 @@ mailboxes =INBOX =Archive =Sent =Trash =Spam
 mailboxes =Automatic.DMARC 
 mailboxes =Lists.Money\ Stuff =Lists.NYT =Lists.SWICG =Lists.Evergreen\ MBA
 mailboxes =NeedleandFoot
-macro index $ "<shell-escape>mbsync andrew@amd.im<enter>notmuch new<enter>" "sync email"
+macro index,pager <F5> "<shell-escape>~/.local/bin/sync_email.sh<enter>" "sync email"
 macro index \\\\ "<vfolder-from-query>" "Search mail"
 
 
@@ -64,12 +68,16 @@ set editor = "nvim"                 # we know we want to edit in nvim
 unset confirmappend                 # don't double check when moving messages
 set reverse_alias                   # if an alias is set for a contact, use that
 set pager_index_lines = 10          # Shows 10 lines of index when pager is active
+set editor = nvim                   # use neovim, of course.
+save-hook . '=Archive'              # Save to archive folder by default
+set wait_key=no                     # dont wait for a key after a command runs (like sync)
 
 
 ### Multipart handling
 set mailcap_path = "~/.config/neomutt/mailcap"
 auto_view text/html
 alternative_order text/plain text/enriched text/html
+macro attach 'V' "<pipe-entry>iconv -c --to-code=UTF8 > ~/.cache/mutt-mail.html<enter><shell-escape>firefox ~/.cache/mutt-mail.html<enter>"
 
 
 ### Message threading