diff --git a/mutt-articles b/mutt-articles
index 1ad72ac..6b49276 100644
--- a/mutt-articles
+++ b/mutt-articles
@@ -6,6 +6,7 @@ General config
 	https://ankursinha.in/2017/12/16/transitioning-to-neomutt-and-friends-for-e-mail.html
 	http://blog.packetqueue.net/living-the-command-line-dream-with-mutt/
 	https://lukespear.co.uk/mutt-multiple-accounts-mbsync-notmuch-gpg-and-sub-minute-updates/
+	https://ankursinha.in/2017/12/16/transitioning-to-neomutt-and-friends-for-e-mail.html
 
 Multi-account
 	https://annotatedtmg.org/mimir/migrating-getting.html
@@ -15,6 +16,9 @@ Multi-account
 GPG setup
 	http://codesorcery.net/old/mutt/mutt-gnupg-howto
 	http://jasonwryan.com/blog/2013/07/20/gnupg/
+	https://sanctum.geek.nz/arabesque/gnu-linux-crypto-email/
+	https://neomutt.org/feature/encrypt-to-self
+	https://gitlab.com/muttmua/mutt/wikis/MuttGuide/UseGPG
 
 Color
 	https://nongeekshandbook.blogspot.com/2009/03/mutt-color-configuration.html
@@ -24,8 +28,6 @@ iCal
 
 Notmuch
 	https://baptiste-wicht.com/posts/2014/08/a-mutt-journey-search-mails-with-notmuch.html
-Notmuch + imapfilter
-	https://copyninja.info/blog/email_setup.html
 Dovecot/Sieve + Notmuch
 	https://anarc.at/blog/2016-05-12-email-setup/#security-considerations
 Notmuch vs Sieve
@@ -51,3 +53,15 @@ Vim keybinds
 
 Mark all as read
 	https://brianbuccola.com/how-to-mark-all-emails-as-read-in-mutt/
+
+Mailcap
+	https://www.mattcutts.com/blog/ppt-attachments-in-mutt/
+	http://www.rdrop.com/docs/mutt/manual85.html
+
+
+
+mbsync,notmuch,dovecot,sieve,systemd,offlineimap,postfix	https://copyninja.info/blog/email_setup.html
+offlineimap,gmail,OSX,mutt,msmtp,notmuch	http://stevelosh.com/blog/2012/10/the-homely-mutt/
+offlineimap,neomutt,notmuch(old method),msmtp,pass,multiple accounts,gpg,mailcap	https://ankursinha.in/2017/12/16/transitioning-to-neomutt-and-friends-for-e-mail.html
+mailcap,office,microsoft,background,attachment	https://www.mattcutts.com/blog/ppt-attachments-in-mutt/
+mailcap	http://www.rdrop.com/docs/mutt/manual85.html
diff --git a/neomutt-setup b/neomutt-setup
new file mode 100644
index 0000000..2c5b70f
--- /dev/null
+++ b/neomutt-setup
@@ -0,0 +1,87 @@
+TODO:
+    [X] IMAP sync
+    [X] SMTP send
+    [X] neomutt account switching
+    [X] organised sidebar
+    [X] encrypted passwords
+    [~] GPG setup
+    [~] IMAP filtering
+    [X] Notmuch search
+    [X] Contacts
+    [ ] Spam filtering (if needed)
+    [ ] git this config
+    [ ] Write blog post
+    [ ] Monitor/fix folder-hook source path issue
+    [ ] Add IMAP quota checking
+    [ ] Parallel account sync
+    [ ] Reduce folder count
+
+New account checklist:
+ - create password file .config/neomutt/<name>.pw.gpg
+ - add to .mbsyncrc
+ - add to .config/msmtp/config
+ - add .config/neomutt/<name>.mail
+ - add source <name> to .config/neomutt/neomuttrc
+ - write fdm filters
+
+Sane HTML viewing
+    ~/.mailcap :
+        text/html; unshare -n -r w3m -I %{charset} -T text/html; copiousoutput;
+    To enable unshare without root:
+        # https://blog.mister-muffin.de/2015/10/25/unshare-without-superuser-privileges/
+        sudo sysctl -w kernel.unprivileged_userns_clone=1
+    Or
+        echo 1 | sudo tee /proc/sys/kernel/unprivileged_userns_clone > /dev/null
+    Or more permanent
+        echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/userns.conf
+
+
+
+/home/
+    <user>/
+        .config/
+            neomutt/
+                neomuttrc
+                colors.rc
+                gpg.rc
+                sidebar.rc
+                <account1>.mail
+                <account1>.pw.gpg
+                ...
+            msmtp/
+                config
+        .mbsyncrc
+/usr/
+    local/
+        bin/
+            mailsync
+/etc/
+    systemd/
+        user/
+            mailsync.timer
+            mailsync.service
+
+systemctl enable --user mailsync.timer
+systemctl enable --user mailsync.service
+systemctl start --user mailsync.timer
+
+Quota checking:
+    https://askubuntu.com/questions/39674/can-i-speak-imap-and-review-my-actual-mail-quota
+    http://www.faqs.org/rfcs/rfc2087.html
+    https://docs.python.org/3.5/library/imaplib.html
+    https://docs.python.org/3.5/library/ssl.html#ssl-security
+
+    Or
+
+    openssl s_client -connect <host>:<port> -starttls imap -crlf
+        And then send commands WHEN SERVER IS READY (maybe use expect ?)
+
+How to delete subfolder
+    /!\ IMAP folder needs to be empty
+    - remove mail from cur,new,tmp
+    - sync folder content
+    - remove ./cur/
+    - sync folder deletion
+
+Archive mail
+    mlist <maildir> | mpick -t 'date < "2017-01-01"' | mrefile 2016