added mail and message