--- a/cagou/plugins/plugin_wid_chat.py	Wed Feb 26 16:43:48 2020 +0100
+++ b/cagou/plugins/plugin_wid_chat.py	Wed Feb 26 16:47:39 2020 +0100
@@ -21,6 +21,7 @@
 from pathlib import Path
 import sys
 import uuid
+from urllib.parse import urlparse
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.textinput import TextInput
 from kivy.uix.screenmanager import Screen, NoTransition
@@ -44,10 +45,10 @@
 from ..core import cagou_widget
 from ..core import xmlui
 from ..core.image import Image
-from ..core.common import SymbolButton, JidButton
+from ..core.common import SymbolButton, JidButton, ContactButton
 from ..core.behaviors import FilterBehavior
 from ..core import menu
-from ..core.common import ContactButton
+from ..core.common_widgets import ImagesGallery
 
 log = logging.getLogger(__name__)
 
@@ -94,10 +95,13 @@
     attachments = properties.ObjectProperty()
 
 
-class AttachmentItem(BoxLayout):
+class BaseAttachmentItem(BoxLayout):
     data = properties.DictProperty()
     progress = properties.NumericProperty(0)
 
+
+class AttachmentItem(BaseAttachmentItem):
+
     def get_symbol(self, data):
         media_type = data.get(C.MESS_KEY_MEDIA_TYPE, '')
         main_type = media_type.split('/', 1)[0]
@@ -118,6 +122,14 @@
             log.warning(f"can't find URL in {self.data}")
 
 
+class AttachmentImageItem(ButtonBehavior, BaseAttachmentItem):
+    image = properties.ObjectProperty()
+
+    def on_press(self):
+        gallery = ImagesGallery(sources=[self.image.source])
+        G.host.showExtraUI(gallery)
+
+
 class AttachmentToSendItem(AttachmentItem):
     # True when the item is being sent
     sending = properties.BooleanProperty(False)
@@ -197,6 +209,10 @@
             status = update_dict['status']
             self.delivery.text =  '\u2714' if status == 'delivered' else ''
 
+    def _setPath(self, item, path):
+        """Set path of decrypted file to an item"""
+        item.data['path'] = path
+
     def add_attachments(self):
         """Add attachments layout + attachments item"""
         attachments = self.mess_data.attachments
@@ -206,7 +222,32 @@
         self.right_part.add_widget(root_layout)
         layout = root_layout.attachments
         for attachment in attachments:
-            item = AttachmentItem(data=attachment)
+            media_type = attachment.get(C.MESS_KEY_MEDIA_TYPE, '')
+            main_type = media_type.split('/', 1)[0]
+            if ((main_type == 'image'
+                 # GIF images are really badly handled by Kivy, the
+                 # memory consumption explode, and the images frequencies
+                 # are not handled correctly, thus we can't display them
+                 # and user will have to open the item.
+                 and media_type != "image/gif"
+                 and (self.mess_data.own_mess or self.chat.contact_list.isInRoster(
+                    self.mess_data.from_jid)))):
+                url = urlparse(attachment['url'])
+                if url.scheme == "aesgcm":
+                    # we remove the URL now, we'll replace it by
+                    # the local decrypted version
+                    del attachment['url']
+                    item = AttachmentImageItem(data=attachment)
+                    G.host.downloadURL(
+                        url.geturl(),
+                        callback=partial(self._setPath, item),
+                        dest=C.FILE_DEST_CACHE,
+                        profile=self.chat.profile,
+                    )
+                else:
+                    item = AttachmentImageItem(data=attachment)
+            else:
+                item = AttachmentItem(data=attachment)
             layout.add_widget(item)