fix existing mail issues