diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index fe9e9ca88..c41cd899c 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -988,6 +988,13 @@ void PopupChatDialog::fileHashingFinished(AttachFileItem* file)
         message+="\" width=\"48\" height=\"48\">";
         message+="<br>";
 	}
+	else if (ext == "jpg" || ext == "jpeg" || ext == "png" || ext == "gif" || ext == "bmp" || ext == "ico" 
+	|| ext == "svg" || ext == "tif" || ext == "tiff" || ext == "JPG")
+	{
+        message+="<img src=\":/images/application-draw.png";
+        message+="\" width=\"48\" height=\"48\">";
+        message+="<br>";
+	}
     
 
 
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 67a64f138..c0c6027a7 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -5,6 +5,7 @@
         <file>images/audio-x-monkey.png</file>
         <file>images/video-x-generic.png</file>
         <file>images/application-x-rar.png</file>
+        <file>images/application-draw.png</file>
         <file>images/pgp.png</file>
         <file>images/rs_wizard.png</file>
         <file>images/about.png</file>
diff --git a/retroshare-gui/src/gui/images/application-draw.png b/retroshare-gui/src/gui/images/application-draw.png
new file mode 100644
index 000000000..bbe1180e1
Binary files /dev/null and b/retroshare-gui/src/gui/images/application-draw.png differ