diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index f439a2811..eb3bcce11 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -460,6 +460,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       temporaryData: formData,
       attachments: [{
         "title": capturedImageTitle ,
+        "image_url": capturedImage, // rocketchat
         "text": "description",
         "title_link_download": false,
       }]
@@ -539,6 +540,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       attachments: [{
         "title": file.name ,
         "text": "description",
+        "image_url": imageData,
         "title_link_download": false,
       }]
     })
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index da1621467..52db3b6ea 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -543,6 +543,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         "image_url": capturedImage
       },
       attachments: [{
+        "image_url": capturedImage,
         "title": capturedImageTitle ,
         "text": "description",
         "title_link_download": false,
@@ -624,6 +625,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       temporaryData: formData,
       attachments: [{
         "title": file.name ,
+        "image_url": imageData,
         "text": "description",
         "title_link_download": false,
       }]
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 54ddc9847..6620a316c 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -162,9 +162,12 @@ export class AuthService {
                 await this.storage.set(guid.path, message.file.image_url).then(() => {
                   console.log('add picture to chat IMAGE SAVED')
                   message.getFileFromDb()
-                  return true
                 });
-              } catch(e) {}
+                
+                return true
+              } catch(e) {
+                return false
+              }
 
             } else {
               try { 
@@ -175,7 +178,9 @@ export class AuthService {
                 message.attachments[0].message_link = url_no_options
                 return true
 
-              } catch(e) {}
+              } catch(e) {
+                return false
+              }
               
             }
           }
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 58425894a..7be23ce8a 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -563,6 +563,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       },
       attachments: [{
         "title": capturedImageTitle ,
+        "image_url": capturedImage,
         "text": "description",
         "title_link_download": false,
       }],
@@ -647,6 +648,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       temporaryData: formData,
       attachments: [{
         "title": file.name ,
+        "image_url": imageData,
         "text": "description",
         "title_link_download": false,
       }]
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 6ecc64c53..29e55cbb0 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -466,6 +466,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       temporaryData: formData,
       attachments: [{
         "title": capturedImageTitle ,
+        "image_url": capturedImage,
         "text": "description",
         "title_link_download": false,
       }]
@@ -536,15 +537,15 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     
     this.wsChatMethodsService.getDmRoom(roomId).send({
       file: {
-        "type": file.type,
+        "type": "application/img",
         "guid": '',
-        "image_url": imageData,
+        "image_url": imageData, // GPR
       },
       attachments: [{
         "title": file.name ,
         "name": file.name ,
         // "text": "description",
-        "image_url": imageData,
+        "image_url": imageData, // rocketchat
         "title_link_download": false,
       }],
       temporaryData: formData