added mail support