Mail Manager functionality added