I also have this issue, and would like a solution.  However I do have a large number of internal emails, that I need to retain To and From label information, even if the email link is invalid.