Included both mail examples in the configs
A few improvements/fixes.