changed image handling for messages