Incorporate the manual changes we had to do on the delegate file which was used for SMTP Setup