diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 3974560fd..0d50edaa1 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -92,13 +92,54 @@
                   </div>
                 </div>
               </div>
-
             </div>
-
           </div>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
+
+      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.alias =='documento'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+        <div class="title">
+          <ion-label>{{msg.u.name}}</ion-label>
+          <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
+        </div>
+        <div class="message">
+          <ion-label>{{msg.msg}}</ion-label>
+          <div *ngIf="msg.attachments" class="message-attachments">
+            <div *ngFor="let file of msg.attachments">
+              <div (click)="openPreview(msg)">
+                <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" >
+              </div>
+              <div>
+                <div>
+                  <div class="file">
+                    <!-- <canvas id="pdf_canvas"></canvas> -->
+                    <div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+                      <span *ngIf="msg.file.type">
+                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
+                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
+                        <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
+                        <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
+                      </span>
+                      <ion-label class="file-title">{{file.title}}</ion-label>
+                    </div>
+                  </div>
+                  <div class="file-details-optional">
+                    <ion-label *ngIf="msg.file">
+                      <span *ngIf="file.description">{{file.description}}</span>
+                      <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
+                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
+                    </ion-label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          {{last ? scrollToBottom() : ''}}
+        </div>
+      </div>
+
+
       <div *ngIf="msg.t == 'r'" class="info-text">
         <ion-label>Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
         {{last ? scrollToBottom() : ''}}
@@ -119,8 +160,8 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
-      <div *ngIf="msg.file" class="info-meeting">
-        <div *ngIf="msg.file.type == 'application/meeting'">
+      <div *ngIf="msg.file">
+        <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
           <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 02df0983c..8bd363076 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -91,8 +91,60 @@
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
-      <div *ngIf="msg.file" class="info-meeting">
-        <div *ngIf="msg.file.type == 'application/meeting'">
+
+      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)" *ngIf="msg.msg !=''">
+        <div class="title">
+          <ion-label>{{msg.u.name}}</ion-label>
+          <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
+        </div>
+        <div>
+          <ion-label>{{msg.msg}}</ion-label>
+          {{last ? scrollToBottom() : ''}}
+        </div>
+      </div>
+
+      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' *ngIf="msg.alias =='documento'">
+        <div class="title">
+          <ion-label>{{msg.u.name}}</ion-label>
+          <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
+        </div>
+        <div>
+          <div *ngIf="msg.attachments" class="message-attachments">
+            <div *ngFor="let file of msg.attachments let i = index">
+              <div *ngIf="file.image_url" (click)="openPreview(msg)">
+                <img src="{{file.image_url}}" alt="image">
+              </div>
+              <div>
+                <div>
+                  <div class="file">
+                    <!-- <canvas id="pdf_canvas"></canvas> -->
+                    <div (click)="docIndex(i); viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+                      <span *ngIf="msg.file.type">
+                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
+                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
+                        <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
+                        <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
+                      </span>
+                      <ion-label class="file-title">{{file.title}}</ion-label>
+                    </div>
+                  </div>
+                  <div class="file-details-optional">
+                    <ion-label *ngIf="msg.file && msg.file != ''">
+                      <span *ngIf="file.description">{{file.description}}</span>
+                      <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
+                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
+                    </ion-label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          {{last ? scrollToBottom() : ''}}
+        </div>
+      </div>
+
+      <div *ngIf="msg.file">
+        <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
           <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 0e72b5634..237c7a89b 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -365,10 +365,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     if (file.type == "application/webtrix") {
       this.openViewDocumentModal(file);
     }
-    else {
-      let fullUrl = "https://www.tabularium.pt" + url;
-      this.fileService.viewDocumentByUrl(fullUrl);
-    }
   }
 
   docIndex(index: number) {
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 16c07557c..c032e7261 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -190,7 +190,7 @@ export class ChatService {
       let opts = {
         headers: this.headers,
       }
-      return this.http.post(environment.apiChatUrl+'im.close', body, this.options);
+      return this.http.post(environment.apiChatUrl+'im.delete', body, this.options);
     }
 
     createRoom(body:any){
diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts
index ee3d2d9de..a5cd7bd01 100644
--- a/src/app/services/functions/file.service.ts
+++ b/src/app/services/functions/file.service.ts
@@ -435,6 +435,7 @@ export class FileService {
           {
             "rid": roomId,
             "msg": "",
+            "alias": "documento",
             "attachments": [{
               "title": res.data.selected.Assunto,
               "description": res.data.selected.DocTypeDesc,
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index ff4c7537b..c09032572 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -91,6 +91,57 @@
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
+
+
+      <div class="message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.alias =='documento'" >
+        <div class="message-item-options d-flex justify-content-end">
+          <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
+          <mat-menu #beforeMenu="matMenu" xPosition="before">
+            <button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
+          </mat-menu>
+        </div>
+        <div class="title">
+          <ion-label>{{msg.u.name}}</ion-label>
+          <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
+        </div>
+        <div class="message">
+          <ion-label>{{msg.msg}}</ion-label>
+          <div *ngIf="msg.attachments" class="message-attachments">
+            <div *ngFor="let file of msg.attachments">
+              <div (click)="openPreview(msg)">
+                <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image">
+              </div>
+              <div>
+                <div>
+                  <div class="file">
+                    <!-- <canvas id="pdf_canvas"></canvas> -->
+                    <div (click)="viewDocument(msg.file, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
+                      <span *ngIf="msg.file.type">
+                        <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
+                        <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word" class="word-icon"></fa-icon>
+                        <fa-icon *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'" icon="file-word" class="excel-icon"></fa-icon>
+                        <ion-icon *ngIf="msg.file.type == 'application/webtrix'" src="assets/icon/webtrix.svg"></ion-icon>
+                      </span>
+                      <ion-label class="file-title">{{file.title}}</ion-label>
+                    </div>
+                  </div>
+                  <div class="file-details-optional">
+                    <ion-label *ngIf="msg.file">
+                      <span *ngIf="file.description">{{file.description}}</span>
+                      <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
+                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
+                    </ion-label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          {{last ? scrollToBottom() : ''}}
+        </div>
+      </div>
+
+
+
       <div *ngIf="msg.t == 'r'" class="info-text">
         <ion-label>Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
         {{last ? scrollToBottom() : ''}}
@@ -111,8 +162,8 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
-      <div *ngIf="msg.file" class="info-meeting">
-        <div *ngIf="msg.file.type == 'application/meeting'">
+      <div *ngIf="msg.file" >
+        <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
           <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 09f89ba4b..656c77f6a 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -9,7 +9,7 @@
         <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
-            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/icons-menu.svg"></ion-icon>
+            <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
           </button>
         </div>
       </div>
@@ -51,13 +51,28 @@
         </div>
         <div>
           <ion-label>{{msg.msg}}</ion-label>
+          {{last ? scrollToBottom() : ''}}
+        </div>
+      </div>
+      <div class='message-item incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45' *ngIf="msg.alias == 'documento'">
+        <div class="message-item-options d-flex justify-content-end">
+          <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
+          <mat-menu #beforeMenu="matMenu" xPosition="before">
+            <button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
+          </mat-menu>
+        </div>
+        <div class="title">
+          <ion-label>{{msg.u.name}}</ion-label>
+          <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
+        </div>
+        <div>
+          <!-- <ion-label>{{msg.msg}}</ion-label> -->
           <div *ngIf="msg.attachments" class="message-attachments">
             <div *ngFor="let file of msg.attachments">
               <div (click)="openPreview(msg)">
-                <!-- <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" (click)="imageSize(file.image_url)"> -->
                 <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image">
               </div>
-              <!-- <div *ngIf="msg.file.type">
+              <div *ngIf="msg.file">
                 <div class="file">
                     <div (click)="viewDocument(msg, file.title_link)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
                       <span *ngIf="msg.file.type">
@@ -77,14 +92,15 @@
                       <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
                     </ion-label>
                 </div>
-              </div> -->
+              </div>
             </div>
           </div>
           {{last ? scrollToBottom() : ''}}
         </div>
+
       </div>
-      <div *ngIf="msg.file" class="info-meeting">
-        <div *ngIf="msg.file.type == 'application/meeting'">
+      <div *ngIf="msg.file" >
+        <div class="info-meeting" *ngIf="msg.file.type == 'application/meeting'">
           <ion-label class="info-meeting-small">{{msg.u.name}} criou esta reunião</ion-label><br />
           <button (click)="goToEvent(msg.file.id)" class="btn-no-color info-meeting-normal"><ion-label class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
           <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss
index 738f71a16..2f6033257 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.scss
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss
@@ -14,6 +14,7 @@
       overflow: hidden;
   }
 }
+
 .buttons{
   display: flex;
   flex-wrap: wrap;
diff --git a/src/app/shared/popover/messages-options/messages-options.page.html b/src/app/shared/popover/messages-options/messages-options.page.html
index 7150aa3fd..85018456f 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.html
+++ b/src/app/shared/popover/messages-options/messages-options.page.html
@@ -1,13 +1,10 @@
 <ion-content class="container">
-  <div class="arrow-right" (click)="close()">
-    <button class="btn-no-color">
-      <ion-icon *ngIf="ThemeService.currentTheme == 'default' "slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
-      <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" class="arrow-right-icon" src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
+  <div class="arrow-right">
+    <button class="btn-no-color" (click)="close()">
+      <ion-icon  src='assets/images/theme/gov/icons-calendar-arrow-right.svg'></ion-icon>
     </button>
   </div>
   <div class="buttons">
-    <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
-    <div class="solid"></div>
-    <button hidden (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
+    <button (click)="closeChatRoom()" full class="btn-delete" shape="round" >Apagar conversa</button>
   </div>
 </ion-content>
diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss
index 29fe1e464..b07cb0e9b 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.scss
+++ b/src/app/shared/popover/messages-options/messages-options.page.scss
@@ -1,50 +1,58 @@
 .container{
-    --padding-top:20px !important;
-   --padding-bottom:20px !important;
-   --padding-start:20px !important;
-   --padding-end:20px !important;
+  --padding-top:20px !important;
+ --padding-bottom:20px !important;
+ --padding-start:20px !important;
+ --padding-end:20px !important;
 }
 .arrow-right{
-    display: none;
-    margin-bottom: 20px;
-    .arrow-right-icon{
-        width: 37px;
-        float: right;
-        font-size: 35px;
-        overflow: hidden;
-    }
+  display: none;
+  margin-bottom: 20px;
+  .arrow-right-icon{
+      width: 37px;
+      float: right;
+      font-size: 35px;
+      overflow: hidden;
+  }
 }
+
 .buttons{
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-around;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
 }
 .solid {
-    display: none;
-    width: 90%;
-    border-top: 1px solid #bbb;
-    margin: 0 auto !important;
-  }
-  /* .btn-ok, .btn-cancel, .btn-delete{
-    width: calc(50% - 10px) !important;
-    margin: 5px 5px 5px 5px !important;
-  } */
-@media only screen and (min-width: 701px) {
-    .arrow-right{
-        display: flex;
-        justify-content: flex-end;
-    }
-    .btn-cancel{
-        display: none;
-        width: 100% !important;
-        margin-bottom: 10px !important;
-    }
-    .btn-delete{
-        width: 100% !important;
-        margin-bottom: 10px !important;
-        margin-top: 10px !important;
-    }
-   /*  .solid{
-        display: block;
-    } */
+  display: block;
+  width: 90%;
+  border-top: 1px solid #bbb;
+  margin: 10px auto !important;
+}
+
+@media only screen and (min-width: 701px) {
+  .arrow-right{
+      display: flex;
+      justify-content: flex-end;
+  }
+  .btn-cancel{
+      //display: none;
+      width: 100% !important;
+      margin-bottom: 10px !important;
+  }
+  .btn-cancel:hover, .btn-delete:hover{
+    background-color: var(--button-hover);
+    color: #fff !important;
+  }
+  .btn-ok{
+    width: 100% !important;
+  }
+  .btn-delete{
+      width: 100% !important;
+      margin-bottom: 10px !important;
+  }
+  .solid{
+      display: block;
+  }
+  .mobile-only{
+    display: none !important;
+  }
+
 }
diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts
index 2de44a93d..07e37d951 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.ts
+++ b/src/app/shared/popover/messages-options/messages-options.page.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ChatService } from 'src/app/services/chat.service';
-import { ThemeService } from 'src/app/services/theme.service'
-
+import { ThemeService } from 'src/app/services/theme.service';
 
 @Component({
   selector: 'app-messages-options',
@@ -18,7 +17,7 @@ export class MessagesOptionsPage implements OnInit {
     private modalController: ModalController,
     private chatService: ChatService,
     private navParams: NavParams,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
   )
   {
     this.roomId = this.navParams.get('roomId');