final mail modification