Added support for full fledged email system on server