Made the Client Compatible with the Presigned Mail