diff --git a/mail/.config/neomutt/accounts/archlinux b/mail/.config/neomutt/accounts/archlinux
new file mode 100644
index 0000000..13cbd49
--- /dev/null
+++ b/mail/.config/neomutt/accounts/archlinux
@@ -0,0 +1,27 @@
+# clear previously defined mailboxes
+#unmailboxes *
+
+# clear previously defined headers
+unmy_hdr *
+
+set mbox = "+archlinux/Archive"
+set postponed = "+archlinux/Drafts"
+set trash = "+archlinux/Trash"
+set record = "+archlinux/Sent"
+
+set realname = "George Rawlinson"
+set from = "grawlinson@archlinux.org"
+set signature = "~/.config/neomutt/signature"
+
+# smtp settings
+set smtp_pass = `pass mail/grawlinson@archlinux.org`
+set smtp_url = smtps://$from@mail.archlinux.org
+
+# archlinux specific macros
+macro index A "<save-message>+archlinux/Archive<enter>" "move message to the archive"
+macro index S "<save-message>+archlinux/Junk<enter>" "mark message as spam"
+macro index D "<save-message>+archlinux/Trash<enter>" "move message to the trash"
+# tag macros
+macro index \Ca "<tag-prefix-cond><save-message>+archlinux/Archive<enter>" "move tagged messages to archive"
+macro index \Cs "<tag-prefix-cond><save-message>+archlinux/Junk<enter>" "move tagged messages to spam"
+macro index \Cd "<tag-prefix-cond><save-message>+archlinux/Trash<enter>" "move tagged messages to trash"
diff --git a/mail/.config/neomutt/accounts/rawlinson b/mail/.config/neomutt/accounts/rawlinson
index c2206f0..350bf62 100644
--- a/mail/.config/neomutt/accounts/rawlinson
+++ b/mail/.config/neomutt/accounts/rawlinson
@@ -11,6 +11,7 @@ set record = "+rawlinson/Sent"
 
 set realname = "George Rawlinson"
 set from = "george@rawlinson.net.nz"
+set signature = "~/.config/neomutt/signature"
 
 # smtp settings
 set smtp_pass = `pass mail/george@rawlinson.net.nz`
diff --git a/mail/.config/neomutt/div_np b/mail/.config/neomutt/div_al
similarity index 100%
rename from mail/.config/neomutt/div_np
rename to mail/.config/neomutt/div_al
diff --git a/mail/.config/neomutt/hooks b/mail/.config/neomutt/hooks
index 5eb409a..2839452 100644
--- a/mail/.config/neomutt/hooks
+++ b/mail/.config/neomutt/hooks
@@ -1,5 +1,6 @@
 # folder hooks for different accounts
 folder-hook rawlinson/*   source ~/.config/neomutt/accounts/rawlinson
+folder-hook archlinux/*   source ~/.config/neomutt/accounts/archlinux
 #folder-hook accountname/* source ~/.config/neomutt/accounts/accountname
 
 source ~/.config/neomutt/accounts/rawlinson # default account
diff --git a/mail/.config/neomutt/mailboxes b/mail/.config/neomutt/mailboxes
index 87d6374..e345a11 100644
--- a/mail/.config/neomutt/mailboxes
+++ b/mail/.config/neomutt/mailboxes
@@ -1,4 +1,7 @@
+named-mailboxes ":: rawlinson" "+rawlinson/INBOX"
 mailboxes `find ~/.mail/rawlinson -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
+named-mailboxes ":: archlinux" "+archlinux/INBOX"
+mailboxes `find ~/.mail/archlinux -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
 #mailboxes `find ~/.mail/accountname -type d -name cur | sort | sed -e 's:/cur/*$::' -e 's/ /\\ /g' | tr '\n' ' '`
 
 # vim: syntax=muttrc
diff --git a/mail/.config/neomutt/signature b/mail/.config/neomutt/signature
new file mode 100644
index 0000000..16932e0
--- /dev/null
+++ b/mail/.config/neomutt/signature
@@ -0,0 +1 @@
+George Rawlinson
diff --git a/mail/.mbsyncrc b/mail/.mbsyncrc
index e45f01a..6b3d6fe 100644
--- a/mail/.mbsyncrc
+++ b/mail/.mbsyncrc
@@ -3,7 +3,9 @@ Create Both
 Expunge Both
 SyncState *
 
-# rawlinson
+#
+# george@rawlinson.net.nz
+#
 IMAPAccount rawlinson
     Host imap.little.kiwi
     User george@rawlinson.net.nz
@@ -60,3 +62,63 @@ Group rawlinson
     Channel rawlinson-junk
     Channel rawlinson-sent
     Channel rawlinson-folders
+
+#
+# grawlinson@archlinux.org
+#
+IMAPAccount archlinux
+    Host mail.archlinux.org
+    User grawlinson
+    PassCmd "pass mail/grawlinson@archlinux.org" # get password from pass
+    AuthMechs LOGIN
+    SSLType IMAPS
+
+# remote storage
+IMAPStore archlinux-remote
+    Account archlinux
+
+# local storage
+MaildirStore archlinux-local
+    Path ~/.mail/archlinux/ # must append slash to specify directory
+    Inbox ~/.mail/archlinux/INBOX # place inbox inside mail dir
+
+# folders
+Channel archlinux-inbox
+    Far :archlinux-remote:INBOX
+    Near :archlinux-local:INBOX
+
+Channel archlinux-archive
+    Far :archlinux-remote:Archive
+    Near :archlinux-local:Archive
+
+Channel archlinux-drafts
+    Far :archlinux-remote:Drafts
+    Near :archlinux-local:Drafts
+
+Channel archlinux-junk
+    Far :archlinux-remote:Junk
+    Near :archlinux-local:Junk
+
+Channel archlinux-sent
+    Far :archlinux-remote:Sent
+    Near :archlinux-local:Sent
+
+Channel archlinux-trash
+    Far :archlinux-remote:Trash
+    Near :archlinux-local:Trash
+
+# all folders except above
+Channel archlinux-folders
+    Far :archlinux-remote:
+    Near :archlinux-local:
+    Patterns * !INBOX !Archive !Drafts !Junk !Sent !Trash
+
+# group all channels, so they can be sync'd with one command `mbsync archlinux`
+Group archlinux
+    Channel archlinux-trash
+    Channel archlinux-inbox
+    Channel archlinux-archive
+    Channel archlinux-drafts
+    Channel archlinux-junk
+    Channel archlinux-sent
+    Channel archlinux-folders
diff --git a/mail/.notmuch-config b/mail/.notmuch-config
index a586583..1f5e964 100644
--- a/mail/.notmuch-config
+++ b/mail/.notmuch-config
@@ -31,7 +31,7 @@ path=.mail
 [user]
 name=George Rawlinson
 primary_email=george@rawlinson.net.nz
-other_email=george@nullpointer.io;
+other_email=george@nullpointer.io;grawlinson@archlinux.org
 
 # Configuration for "notmuch new"
 #