Mail - restructured

* does not compile yet, blocked by ldap-server, network