Changes made for mail utility.