Click to display cannot solve this completely, it will change general practice from using one tracking pixel to make all images tracking. Although, it could work for text emails with just tracking pixel.