Changes done to have a static mail id as mail forwarding client