diff --git a/aliases b/aliases
index 1d82af4..858b903 100644
--- a/aliases
+++ b/aliases
@@ -1,4 +1,4 @@
 alias irc="ssh -6 pew@paul.walko.org"
 alias irc-admin="ssh -6 ubuntu@paul.walko.org"
 alias hackbox="ssh -p2222 -6 paul@cabinet.walko.org"
-alias mutt="export CURR_DIR=$PWD && mutt && cd $CURR_DIR"
+alias mutt="export CURR_DIR=`echo $PWD` && mutt && cd $CURR_DIR"
diff --git a/mutt/msmtp.log b/mutt/msmtp.log
index 2619f19..0b7da63 100644
--- a/mutt/msmtp.log
+++ b/mutt/msmtp.log
@@ -9,3 +9,7 @@ Jun 18 19:37:38 host=smtp.gmail.com tls=on auth=on user=pwalko@vt.edu from=pwalk
 Jun 18 20:17:05 host=smtp.gmail.com tls=on auth=on user=pwalko@vt.edu from=pwalko@vt.edu recipients=paulsw.pw@gmail.com mailsize=579645 smtpstatus=250 smtpmsg='250 2.0.0 OK 1497831426 g6sm5462018qkb.48 - gsmtp' exitcode=EX_OK
 Jun 18 20:55:43 host=smtp.gmail.com tls=on auth=on user=pwalko@vt.edu from=pwalko@vt.edu recipients=joe@walko.org mailsize=1411 smtpstatus=250 smtpmsg='250 2.0.0 OK 1497833744 u9sm6164611qtb.29 - gsmtp' exitcode=EX_OK
 Jun 19 00:55:53 host=smtp.gmail.com tls=on auth=on user=paulsw.pw@gmail.com from=paulsw.pw@gmail.com recipients=pwalko@vt.edu mailsize=77 smtpstatus=250 smtpmsg='250 2.0.0 OK 1497848154 a68sm3950810ywe.6 - gsmtp' exitcode=EX_OK
+Jul 26 18:35:41 host=smtp.gmail.com tls=on auth=on user=pwalko@vt.edu from=pwalko@vt.edu recipients=paul@walko.org mailsize=3442 smtpstatus=250 smtpmsg='250 2.0.0 OK 1501108553 o20sm13338026qtc.23 - gsmtp' exitcode=EX_OK
+Jul 26 18:37:49 host=smtp.gmail.com tls=on auth=on user=pwalko@vt.edu from=pwalko@vt.edu recipients=jlewis86@vt.edu mailsize=3521 smtpstatus=250 smtpmsg='250 2.0.0 OK 1501108681 o25sm12382344qkl.40 - gsmtp' exitcode=EX_OK
+Aug 05 20:24:47 host=smtp.gmail.com tls=on auth=on user=paulsw.pw@gmail.com from=paulsw.pw@gmail.com recipients=2zc53-6247206789@sale.craigslist.org mailsize=537 smtpstatus=250 smtpmsg='250 2.0.0 OK 1501979101 f15sm3588561qtf.93 - gsmtp' exitcode=EX_OK
+Aug 10 23:05:30 host=smtp.gmail.com tls=on auth=on user=pwalko@vt.edu from=pwalko@vt.edu recipients=paul@walko.org mailsize=133232 smtpstatus=250 smtpmsg='250 2.0.0 OK 1502420747 v12sm2735721ywa.51 - gsmtp' exitcode=EX_OK
diff --git a/mutt/muttrc b/mutt/muttrc
index f4627ca..7b8c2e8 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -48,15 +48,18 @@ macro pager		\Cu "|urlview<enter>" "call urlview to open links"
 set spoolfile		= "+vt/INBOX"
 
 mailboxes		+vt/INBOX \
-			+gmail/INBOX \
 			+walko/INBOX \
-			+gmail/updates \
-			+gmail/social \
-			+vt/xen-devel \
-			+vt/OCVT \
-			+vt/CISCO \
-			+vt/SWAT 	
-
+			+gmail/INBOX \
+			+vt/9_fall17 \
+			+vt/A_vtluug \
+			+vt/B_ocvt \
+			+vt/N_misc.cisco \
+			+vt/Z_xen-devel \
+			+walko/0_updates \
+			+walko/1_social \
+			+gmail/0_updates \
+			+gmail/1_social \
+			
 folder-hook vt/*	source ~/.mutt/accounts/vt
 folder-hook walko/*	source ~/.mutt/accounts/walko
 folder-hook gmail/*	source ~/.mutt/accounts/gmail