Increase consistency of header data (some mail readers really do not