diff --git a/mail/.mbsyncrc b/mail/.mbsyncrc
index 2172d21..c2ccd67 100644
--- a/mail/.mbsyncrc
+++ b/mail/.mbsyncrc
@@ -105,3 +105,56 @@ SyncState *
 
 Group selectperson
 Channel selectperson-folders
+
+IMAPAccount sdf
+Host mx.sdf.org
+User secstate
+PassCmd "pass personal/secstate@sdf.org"
+SSLType IMAPS
+Port 993
+
+IMAPStore sdf-remote
+account sdf
+
+MaildirStore sdf-local
+# trailing "/" is important
+Path ~/Mail/secstate@sdf.org/
+Inbox ~/Mail/secstate@sdf.org/Inbox
+Trash Trash
+
+Channel sdf-folders
+Master :sdf-remote:
+Slave :sdf-local:
+Patterns "INBOX" "Drafts" "Archive" "Sent" "Trash"
+Create Both
+Expunge Both
+SyncState *
+
+Group sdf
+Channel sdf-folders
+
+IMAPAccount 15five
+Host imap.gmail.com
+User colin.powell@15five.com
+PassCmd "pass 15five/mbsync"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+Port 993
+
+IMAPStore 15five-remote
+Account 15five
+
+MaildirStore 15five-local
+Path ~/Mail/colin.powell@15five.com
+Inbox ~/Mail/colin.powell@15five.com/Inbox
+
+Channel 15five-folders
+Master :15five-remote:
+Slave :15five-local:
+Patterns "\[Google Mail\]/All Mail" "\[Google Mail\]/Drafts" "\[Google Mail\]/Sent Mail"
+Create Both
+Expunge Both
+SyncState *
+
+Group 15five
+Channel 15five-folders
diff --git a/mail/.msmtprc b/mail/.msmtprc
index b501fc8..deca348 100644
--- a/mail/.msmtprc
+++ b/mail/.msmtprc
@@ -1,14 +1,50 @@
 defaults
-auth            on
-tls             on
-tls_fingerprint 09:B4:AE:DB:70:53:C5:6B:88:F0:32:82:C0:CF:1F:60:90:F1:39:8A
 logfile         ~/.msmtp.log
 
+#############################
 account        onec
+auth           on
 host           box.onec.me
 port           587
 from           colin@onec.me
 user           colin@onec.me
+tls            on
+tls_fingerprint 09:B4:AE:DB:70:53:C5:6B:88:F0:32:82:C0:CF:1F:60:90:F1:39:8A
 passwordeval   pass personal/colin@onec.me
+#############################
 
 account default : onec
+
+#############################
+account        selectperson
+auth           on
+host           box.onec.me
+port           587
+from           colin@selectperson.me
+user           colin@selectperson.me
+tls            on
+passwordeval   pass personal/colin@onec.me
+#############################
+
+
+#############################
+account        timberwyck
+auth           on
+host           box.onec.me
+port           587
+from           colin@timberwyckfarm.com
+user           colin@timberwyckfarm.com
+tls            on
+passwordeval   pass personal/colin@onec.me
+#############################
+
+#############################
+account        15five
+auth           on
+host           smtp.gmail.com
+port           587
+from           colin.powell@15five.com
+user           colin.powell@15five.com
+tls            on
+passwordeval   pass 15five/mbsync
+#############################