diff --git a/appservice.py b/appservice.py
index 7c3bca1..ac39ab6 100644
--- a/appservice.py
+++ b/appservice.py
@@ -40,6 +40,15 @@ def on_receive_events(transaction):
                 else:
                     token = app.config['MATRIX_PNUT_TOKEN']
                     text = "* " + get_displayname(event["user_id"]) + " " + event['content']['body']
+            elif event['content']['msgtype'] == 'm.image':
+                imgurl = app.config['MATRIXBOT_HOST'] + '/_matrix/media/r0/download/' + event['content']['url'][6:]
+                if user:
+                    token = user.pnut_token
+                    text = ""
+                else:
+                    token = app.config['MATRIX_PNUT_TOKEN']
+                    text = "[" + get_displayname(event["user_id"]) + "]    "
+                text += event['content']['body'] + " : " + imgurl
             else:
                 text = None