Added basic mail support