Robert Lyon authored Jan 20, 2016 and Aaron Wells committed Mar 29, 2016

Best to keep this current as mail is an important component of the
system

behatnotneeded

Change-Id: Ifc845036ca6973445a3b99e6d612494269bae143
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>