mail removal fix