added mail support
changed configuration