Enable forward of image messages
Merge remote-tracking branch 'origin/fast_forward' into fast_forward

Enable forward of image messages

# This is the 2nd commit message:

Enable forward of image messages