diff --git a/mail/.msmtprc b/mail/.msmtprc
index f45c5cb..01c5013 100644
--- a/mail/.msmtprc
+++ b/mail/.msmtprc
@@ -8,12 +8,10 @@ port           587
 from           colin@timberwyckfarm.com
 user           colin@timberwyckfarm.com
 tls            on
-tls_fingerprint 7D:1D:BB:62:79:5D:58:81:3A:00:8D:BB:6E:0A:57:9A:2E:66:B4:3D
+tls_fingerprint 05:E4:26:E1:BC:F1:4D:4C:18:6E:B6:D9:42:5B:CE:4C:28:74:27:B4
 passwordeval   pass personal/colin@onec.me
 #############################
 
-account default : timberwyck
-
 #############################
 account        castine.town
 auth           on
@@ -22,7 +20,7 @@ port           587
 from           colin@castine.town
 user           colin@castine.town
 tls            on
-tls_fingerprint 7D:1D:BB:62:79:5D:58:81:3A:00:8D:BB:6E:0A:57:9A:2E:66:B4:3D
+tls_fingerprint 86:0C:62:FD:2A:9A:51:9C:E0:9F:4E:B1:32:24:0E:0F:57:91:0A:1B
 passwordeval   pass personal/colin@castine.town
 #############################
 
@@ -36,3 +34,6 @@ user           colin.powell@15five.com
 tls            on
 passwordeval   pass 15five/mbsync
 #############################
+#
+account default : timberwyck
+
diff --git a/mail/.notmuch-config b/mail/.notmuch-config
index d5b0b89..c736ccc 100644
--- a/mail/.notmuch-config
+++ b/mail/.notmuch-config
@@ -3,8 +3,8 @@ path=/home/powellc/Mail
 
 [user]
 name=Colin Powell
-primary_email=colin@onec.me
-other_email=colin@timberwyckfarm.com;hello@colinforcastine.com,colin@unbl.ink
+primary_email=colin@timberwyckfarm.com
+other_email=colin@timberwyckfarm.com;colin@castine.town;colin@unbl.ink
 
 [new]
 tags=new