Adding mail support