Bug 1058900 - [email] pinch/zoom mitigations

and if so, does that remove the need for putImagesBackIfNeeded to be passed in here and the change in message_reader?