Merge pull request #9489 from gnarf37/840059-image-preview

Part 1: Bug 840059 - [MMS][User Story] Photo display from message(cherry picked from commit 1ab9bc88799b4af10fef8a810570e23402934bb3)