diff --git a/neomutt/macros b/neomutt/macros
index 83e332b..60f526b 100644
--- a/neomutt/macros
+++ b/neomutt/macros
@@ -48,3 +48,8 @@ set invpipe_decode<enter>"                                                # View
 macro generic "\e?" "<shell-escape>less /usr/share/doc/mutt/manual.txt<enter>"
 macro index   "\e?" "<shell-escape>less /usr/share/doc/mutt/manual.txt<enter>"
 macro pager   "\e?" "<shell-escape>less /usr/share/doc/mutt/manual.txt<enter>"
+
+unbind editor <space>
+macro compose \Ca ":source ~/bin/fzfattach.sh|<enter>"
+
+macro pager A |'abook --add-email'\n
diff --git a/neomutt/mailcap b/neomutt/mailcap
index 91268fb..3f12b9d 100644
--- a/neomutt/mailcap
+++ b/neomutt/mailcap
@@ -1,9 +1,24 @@
-text/vcard;                 mutt_vcard_filter; copiousoutput
-text/html;                  w3m -dump %s; copiousoutput; nametemplate=%s.html
-application/x-html;         w3m -dump %s; copiousoutput; nametemplate=%s.html
-image/jpeg;                 gthumb %s;
-application/octet-stream;   mutt-octet-filter %s; copiousoutput
-text/x-diff;                view %s; needsterminal
-text/x-patch;               view %s; needsterminal
-application/x-gzip;         zcat %s; copiousoutput
 application/msword;         soffice %s;
+
+#application/octet-stream;   ~/bin/mutt.octet.filter %s; copiousoutput
+application/octet-stream;   file -b %s; copiousoutput
+
+application/pdf;            open -a "Preview" %s;
+
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;  open -a "Microsoft Excel" %s
+
+application/x-gzip;         zcat %s; copiousoutput
+
+application/x-html;         open -a "Firefox" %s; nametemplate=%s.html
+application/x-html;         w3m -dump %s; copiousoutput; nametemplate=%s.html
+
+image/*;                    open -a "Preview" %s;
+
+text/html;                  open -a "Firefox" %s; nametemplate=%s.html
+text/html;                  w3m -dump %s; copiousoutput; nametemplate=%s.html
+
+text/vcard;                 mutt_vcard_filter; copiousoutput
+
+text/x-diff;                view %s; needsterminal
+
+text/x-patch;               view %s; needsterminal
diff --git a/neomutt/neomuttrc b/neomutt/neomuttrc
index 918cd29..8aa6929 100644
--- a/neomutt/neomuttrc
+++ b/neomutt/neomuttrc
@@ -8,6 +8,7 @@ set hostname=felurian.guidepointsecurity.com        # Name of the localhost
 set hidden_host                                     # Hide host details
 set alias_file=~/.config/neomutt/aliases            # Personal mail aliases
 #set query_command="~/bin/mutt-ldap '%s'"           # How to query the company contacts
+set query_command="abook --mutt-query '%s'"         # How to query the company contacts
 set postpone=ask-no                                 # Ask about postponing
 unset move                                          # Keep read mail in inbox, also Gmail moves it automatically
 set print=ask-no                                    # Ask before printing
diff --git a/neomutt/save-hooks b/neomutt/save-hooks
index 66b97e4..ad05d19 100644
--- a/neomutt/save-hooks
+++ b/neomutt/save-hooks
@@ -4,6 +4,7 @@
 #
 
 #save-hook .* =Archive/`date "+%Y"`/`date "+%m"`
+save-hook '=f @analog.com' "=Customers/Analog"
 save-hook '~f @nafinc\\.com$' "=Customers/NAF"
 save-hook '~f @newyorklife\\.com$' "=Customers/NYLife"
 save-hook '=f @rtx.com' "=Customers/RTX"