diff --git a/afew/config b/afew/config
index 376517e..0cc41d4 100644
--- a/afew/config
+++ b/afew/config
@@ -1,6 +1,6 @@
 # This is the default filter chain
 [SpamFilter]
-[ClassifyingFilter]
+#[ClassifyingFilter]
 [KillThreadsFilter]
 [ListMailsFilter]
 [ArchiveSentMailsFilter]
diff --git a/alot/config b/alot/config
new file mode 100644
index 0000000..a95f1c6
--- /dev/null
+++ b/alot/config
@@ -0,0 +1,14 @@
+prefer_plaintext = True
+tabwidth = 4
+
+[accounts]
+    [[IOCOM]]
+        realname = Dustin Swan
+        address = dustinswan@gmail.com
+        gpg_key = 2B3A6377
+        sendmail_command = msmtp --account=DswanIOCOM -t
+
+    [[Gmail]]
+        realname = Dustin Swan
+        address = dswan@iocom.com
+        sendmail_command = msmtp --account=DustinswanGmail -t
diff --git a/bootstrap-mac.sh b/bootstrap-mac.sh
index 24b3d7e..3946143 100644
--- a/bootstrap-mac.sh
+++ b/bootstrap-mac.sh
@@ -58,7 +58,7 @@ brew cask install the-unarchiver
 brew cask install electrum
 brew cask install steam
 brew cask install sketchup
-#brew cask install gpgtools ???
+brew cask install gpgtools
 #brew cask install vagrant
 #brew cask install bittorrent-sync
 #brew cask install truecrypt
diff --git a/mbsyncrc b/mbsyncrc
index 2a0ddf5..65a5573 100644
--- a/mbsyncrc
+++ b/mbsyncrc
@@ -25,3 +25,30 @@ Create Both
 # Expunge Both
 # Save the synchronization state files in the relevant directory
 SyncState *
+
+
+
+IMAPAccount iocom
+Host secure.emailsrvr.com
+User dswan@insors.com
+PassCmd "gpg -d ~/.iocom-password.gpg"
+# SSL
+UseIMAPS yes
+
+IMAPStore iocom-remote
+Account iocom
+
+MaildirStore iocom-local
+Path ~/.mail/iocom/
+Inbox ~/.mail/iocom/INBOX
+
+Channel iocom
+Master :iocom-remote:
+Slave :iocom-local:
+# Include everything
+Patterns *
+# Automatically create missing mailboxes, both locally and on the server
+Create Both
+# Expunge Both
+# Save the synchronization state files in the relevant directory
+SyncState *
diff --git a/msmtprc b/msmtprc
index e9655fe..fadf6ce 100644
--- a/msmtprc
+++ b/msmtprc
@@ -5,17 +5,17 @@ protocol smtp
 auth on
 from dustinswan@gmail.com
 user dustinswan@gmail.com
-passwordeval gpg -d ~/.gmail-password.gpg
-tls on
+passwordeval gpg --no-tty -d ~/.gmail-password.gpg
+#tls on
 #tls_trust_file ~/.mutt/gmail_cert
 
-#account DswanIOCOM
-#host secure.emailsrvr.com
-#port 587
-#protocol smtp
-#auth on
-#from dswan@iocom.com
-#user dswan@insors.com
-#passwordeval gpg --no-tty -d ~/.iocom_password.gpg
+account DswanIOCOM
+host secure.emailsrvr.com
+port 587
+protocol smtp
+auth on
+from dswan@iocom.com
+user dswan@insors.com
+passwordeval gpg --no-tty -d ~/.iocom-password.gpg
 
 account default : DustinswanGmail
diff --git a/notmuch-config b/notmuch-config
index a05b2a2..8aae0ce 100644
--- a/notmuch-config
+++ b/notmuch-config
@@ -47,7 +47,8 @@ primary_email=dustinswan@gmail.com
 #		in the mail store.
 #
 [new]
-tags=unread;inbox;
+tags=new
+#tags=unread;inbox;
 ignore=
 
 # Search configuration
diff --git a/notmuch-post-new b/notmuch-post-new
new file mode 100755
index 0000000..19a2fed
--- /dev/null
+++ b/notmuch-post-new
@@ -0,0 +1,2 @@
+#!/bin/sh
+afew --tag --new
diff --git a/symlinks.sh b/symlinks.sh
index c6e8946..5e0a1d6 100644
--- a/symlinks.sh
+++ b/symlinks.sh
@@ -5,14 +5,19 @@ rm -rf ~/.config/fish; mkdir -p ~/.config/fish; ln -s ~/dotfiles/config.fish ~/.
 rm ~/.gemrc; ln -s ~/dotfiles/gemrc ~/.gemrc
 rm -rf ~/.ghc; mkdir ~/.ghc; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
 rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig
-rm ~/.mbsyncrc; ln -s ~/dotfiles/mbsyncrc ~/.mbsyncrc
-rm ~/.msmtprc; ln -s ~/dotfiles/msmtprc ~/.msmtprc
 rm ~/.ruby-version; ln -s ~/dotfiles/ruby-version ~/.ruby-version
 rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
 rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim
 rm ~/.vimperatorrc; ln -s ~/dotfiles/vimperatorrc ~/.vimperatorrc
 
+# Mail stuff
+rm ~/.mbsyncrc; ln -s ~/dotfiles/mbsyncrc ~/.mbsyncrc
+rm ~/.msmtprc; ln -s ~/dotfiles/msmtprc ~/.msmtprc
+rm -rf ~/.config/alot; ln -s ~/dotfiles/alot ~/.config/
+rm -rf ~/.config/afew; ln -s ~/dotfiles/afew ~/.config/
+rmdir ~/.mail/.notmuch/hooks; mkdir -p ~/.mail/.notmuch/hooks; ln -s ~/dotfiles/notmuch-post-new ~/.mail/.notmuch/hooks/post-new
+
 # TODO mac only
 rm ~/.slate.js; ln -s ~/dotfiles/slate.js ~/.slate.js
 rm ~/.urlview; ln -s ~/dotfiles/urlview.mac ~/.urlview
diff --git a/zshrc b/zshrc
index 0edee7d..5d7db66 100644
--- a/zshrc
+++ b/zshrc
@@ -52,7 +52,13 @@ fi
 chruby $(cat ~/.ruby-version)
 
 # GPG
-~/dotfiles/bin/gpg-agent.sh
+GPG_AGENT=$(which gpg-agent)
+GPG_TTY=`tty`
+export GPG_TTY
+
+if [ -f ${GPG_AGENT} ]; then
+    . ~/dotfiles/bin/gpg-agent.sh
+fi
 
 #autoload predict-on
 #predict-on