Re-develop mail service