diff --git a/states/email/aliases/aliases b/states/email/aliases/aliases
new file mode 100644
index 0000000..fdfa0d7
--- /dev/null
+++ b/states/email/aliases/aliases
@@ -0,0 +1,44 @@
+# /etc/aliases
+mailer-daemon: postmaster
+postmaster: root
+nobody: root
+hostmaster: root
+usenet: root
+news: root
+webmaster: root
+www: root
+www-data: root
+ftp: root
+abuse: root
+noc: root
+security: root
+
+root:jim@lunch.org.uk
+
+alexandra: alex
+alexandra.hague: alex
+bunny: alex
+ali: alex
+ali.hague: alex
+jim.hague: jim
+heather.james: heather
+chrissie: chrissy
+christina: chrissy
+christina.hague: chrissy
+toby: jim
+fitzroy: jim
+nthague: jim
+
+hannah.farncombe: hannah
+#hannah: hjfarncombe@me.com
+
+wpcc: jim
+
+ryman: jim
+
+parents: jim,heather
+
+jenkins: jim
+
+clamav: root
+monit: root
diff --git a/states/email/aliases/aliases.cowboybuilder.org.uk b/states/email/aliases/aliases.cowboybuilder.org.uk
new file mode 100644
index 0000000..8977f55
--- /dev/null
+++ b/states/email/aliases/aliases.cowboybuilder.org.uk
@@ -0,0 +1,11 @@
+# This is the aliases file for cryhavoc.org.uk. It does not permit
+# file aliases.
+
+postmaster: root
+root: jim@lunch.org.uk
+mailer-daemon: postmaster
+mail: postmaster
+webmaster: root
+admin: root
+
+woody: jim
diff --git a/states/email/aliases/aliases.cryhavoc.org.uk b/states/email/aliases/aliases.cryhavoc.org.uk
new file mode 100644
index 0000000..36e2e9f
--- /dev/null
+++ b/states/email/aliases/aliases.cryhavoc.org.uk
@@ -0,0 +1,23 @@
+# This is the aliases file for cryhavoc.org.uk. It does not permit
+# file aliases.
+
+postmaster: root
+root: jim@lunch.org.uk
+mailer-daemon: postmaster
+mail: postmaster
+webmaster: root
+admin: root
+
+info: jim
+
+www-data: jim@lunch.org.uk
+jim: jim@lunch.org.uk
+wiki: jim@lunch.org.uk
+
+bag: louisthurman@gmail.com, jim@lunch.org.uk
+foreman: jim@lunch.org.uk
+dottes: jim@lunch.org.uk
+squire: jim@lunch.org.uk
+treasurer: phm.day202@btinternet.com
+
+privacy: squire,bag
diff --git a/states/email/aliases/aliases.lunch.org.uk b/states/email/aliases/aliases.lunch.org.uk
new file mode 100644
index 0000000..f2b655f
--- /dev/null
+++ b/states/email/aliases/aliases.lunch.org.uk
@@ -0,0 +1,77 @@
+# This is the aliases file for lunch.org.uk. It does not permit
+# file and pipe aliases.
+
+postmaster: root
+root: jim
+mailer-daemon: postmaster
+mail: postmaster
+webmaster: root
+
+nas: jim
+
+alexandra: alex
+alexandra.hague: alex
+ali: alex
+bunny: alex
+jim.hague: jim
+heather.james: heather
+chrissie: chrissy
+christina: chrissy
+christina.hague: chrissy
+toby: jim
+fitzroy: jim
+santa: jim
+joybear: jim
+
+#OxLUG
+#oxlug: jim@lunch.org.uk,
+#	leonard.ian@gmail.com,
+#	ian@smallworld.cx,
+#	phil@kantaka.co.uk,
+#	hubert@oxyware.com,
+#	tim.pizey@gmail.com,
+#	entity@danny.id.au,
+#	robertbentall@gmail.com,
+#	chris@griggs.me.uk,
+#	nicholas.cole@history.ox.ac.uk,
+#	dom@earth.li,
+#	deya_sanchez@oslerdiagnostics.com,
+#	james@inkblotsoftware.com
+
+# MHCC 
+mhcc-all: jim@bear-cave.org.uk,
+		MarlbHCricket@aol.com,
+		martin@italy-update.demon.co.uk,
+		em_dom@hotmail.com,
+		gurmej.lal@siemens.com,
+		Huw.Leggate@Jet.uk,
+		Karen.Carroll@oxmhc-tr.nhs.uk,
+		jondunkley@aol.com,
+		Marni786ms@hotmail.com,
+		Mike.Reeves@wallingfordsoftware.com,
+		mitchell_fraser-jones@hen.invesco.com,
+		Sally.Moore@oxon.blackwellpublishing.com,
+		sureshp@sterilox.com,
+		mshelloxford@yahoo.com,
+		owenslat@hotmail.com,
+		sundancekid69@Hotmail.com,
+		bigash51@yahoo.co.uk,
+		andrewlines@O2.co.uk,
+		willsyboy3@hotmail.com,
+		Richard.Body@WallingfordSoftware.com,
+		abastin@oxford.gov.uk,
+		Andrew.Land@atkinsglobal.com,
+		gwyn.jones@aeat.co.uk,
+		Paul.Henley@Man.ac.uk,
+		alberto.behar@nuffield.oxford.ac.uk,
+		jeremy.bowell@oup.com,
+		richard.coggins@magdalen.oxford.ac.uk,
+		gwyn.jones@aeat.co.uk,
+		alistair.james@eng.ox.ac.uk
+
+
+# MHCC SMS
+mhcc-sms: bcb7049f07f4c44cbc6497aa81f92b@dist.aql.com
+
+jane: janestannard@hotmail.com
+#jane: jim@lunch.org.uk, janestannard@hotmail.com
diff --git a/states/email/init.sls b/states/email/init.sls
index 77c2cd5..503b426 100644
--- a/states/email/init.sls
+++ b/states/email/init.sls
@@ -2,3 +2,4 @@ include:
   - email/dovecot
   - email/rspamd
   - email/exim4
+  - email/mailboxes
diff --git a/states/email/mailboxes.sls b/states/email/mailboxes.sls
new file mode 100644
index 0000000..67d5607
--- /dev/null
+++ b/states/email/mailboxes.sls
@@ -0,0 +1,48 @@
+# Mailboxes that need to exist, and supporting files.
+
+heather:
+  group.present:
+    - gid: 1001
+  user.present:
+    - fullname: 'Heather James'
+    - home: /home/heather
+    - shell: /bin/bash
+    - uid: 1001
+    - gid: 1001
+
+alex:
+  group.present:
+    - gid: 1002
+  user.present:
+    - fullname: 'Alexandra Hague'
+    - home: /home/alex
+    - shell: /bin/bash
+    - uid: 1002
+    - gid: 1002
+
+chrissy:
+  group.present:
+    - gid: 1003
+  user.present:
+    - fullname: 'Christina Hague'
+    - home: /home/chrissy
+    - shell: /bin/bash
+    - uid: 1003
+    - gid: 1003
+
+hannah:
+  group.present:
+    - gid: 1007
+  user.present:
+    - fullname: 'Hannah Farncombe'
+    - home: /home/hannah
+    - shell: /bin/bash
+    - uid: 1005
+    - gid: 1007
+
+email_aliases:
+  file.recurse:
+    - name: /etc
+    - file_mode: '0644'
+    - source: salt://email/aliases
+