diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index efccca931..91b3838a4 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -65,7 +65,7 @@
                         </div>
                         <div class="item-date" [class.item-date-active]="dm._id == idSelected">{{showDateDuration(dm._updatedAt)}}</div>
                       </div>
-                      <div class="item-description" [class.item-description-active]="dm._id == idSelected">
+                      <div *ngIf="dm.lastMessage" class="item-description" [class.item-description-active]="dm._id == idSelected">
                         <ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
                         <ion-label *ngIf="dm.lastMessage.file">
                           <fa-icon icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index c3496e88e..991abb5a2 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -382,6 +382,7 @@ hideRefreshButton(){
   async getDirectMessages(event?){
 
     this.chatService.getAllDirectMessages().subscribe(async (res:any)=>{
+      console.log(res.ims);
 
       if(res != 200){
         //console.log(res.ims);
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 6d649403c..13523de85 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -40,11 +40,11 @@
 
 
 <ion-content>
-  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+  <!-- <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
     <ion-refresher-content>
     </ion-refresher-content>
-  </ion-refresher>
+  </ion-refresher> -->
 
   <div (click)="handleClick()" class="messages overflow-y-auto" #scrollMe>
     <div class="welcome-text">
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 8a623855f..3c15cac40 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -41,11 +41,11 @@
 
 <ion-content>
 
-  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+  <!-- <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
     <ion-refresher-content>
     </ion-refresher-content>
-  </ion-refresher>
+  </ion-refresher> -->
 
   <div (click)="handleClick()" class="messages" #scrollMe>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of chatMessageStore.message[roomId]; let last = last"
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 15f53070d..ffe35051b 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -401,6 +401,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async openChatOptions(ev?: any) {
+    const roomId = this.roomId
     console.log(this.members);
 
     const popover = await this.popoverController.create({
@@ -421,11 +422,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         this.bookMeeting();
       }
       else if(res['data'] == 'take-picture'){
-        this.fileService.addCameraPictureToChat(this.roomId);
+        this.fileService.addCameraPictureToChat(roomId);
         //this.loadPicture();
       }
       else if(res['data'] == 'add-picture'){
-        this.fileService.addPictureToChat(this.roomId);
+        this.fileService.addPictureToChat(roomId);
         //this.loadPicture();
       }
       else if(res['data'] == 'add-document'){
diff --git a/src/app/services/functions/file.service.ts b/src/app/services/functions/file.service.ts
index 95f02e6b5..41a6c5e4c 100644
--- a/src/app/services/functions/file.service.ts
+++ b/src/app/services/functions/file.service.ts
@@ -111,7 +111,7 @@ export class FileService {
     }
   }
 
-  addPictureToChat(roomId:string) {
+  addPictureToChat(roomId) {
     const input = this.fileLoaderService.createInput({
       accept: ['image/apng', 'image/jpeg', 'image/png']
     })
@@ -141,6 +141,8 @@ export class FileService {
         }
       }
 
+      console.log(this.capturedImage)
+
       this.chatService.sendMessage(body).subscribe(res=> {
         loader.remove();
         //console.log(res);
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 051d6a75d..94cbbd60c 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -138,18 +138,18 @@
           <ion-fab-button (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button (click)="addFileWebtrix()" color="light">
-            <ion-icon src="assets/icon/webtrix.svg"></ion-icon>
-          </ion-fab-button>
           <ion-fab-button (click)="addFile()" color="light">
             <ion-icon name="document"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button (click)="addImage()" color="light">
+          <ion-fab-button hidden (click)="addImage()" color="light">
             <ion-icon name="image"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
+          <ion-fab-button hidden class="hide-desktop" (click)="takePicture()" color="light">
             <ion-icon name="camera"></ion-icon>
           </ion-fab-button>
+          <ion-fab-button (click)="addFileWebtrix()" color="light">
+            <ion-icon src="assets/icon/webtrix.svg"></ion-icon>
+          </ion-fab-button>
         </ion-fab-list>
       </ion-fab>
     </div>
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index a26012f2e..d1e2cc28e 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -111,10 +111,7 @@
           <ion-fab-button (click)="bookMeeting()" color="light">
             <ion-icon name="calendar"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button (click)="addFileWebtrix()" color="light">
-            <ion-icon src="assets/icon/webtrix.svg"></ion-icon>
-          </ion-fab-button>
-          <ion-fab-button (click)="addFile()" color="light">
+          <ion-fab-button hidden (click)="addFile()" color="light">
             <ion-icon name="document"></ion-icon>
           </ion-fab-button>
           <ion-fab-button (click)="addImage()" color="light">
@@ -123,6 +120,9 @@
           <ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
             <ion-icon name="camera"></ion-icon>
           </ion-fab-button>
+          <ion-fab-button (click)="addFileWebtrix()" color="light">
+            <ion-icon src="assets/icon/webtrix.svg"></ion-icon>
+          </ion-fab-button>
         </ion-fab-list>
       </ion-fab>
 
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index dddeaea49..3b20a5099 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -380,10 +380,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
 
   takePicture(){
-    this.fileService.addCameraPictureToChat(this.roomId);
+    const roomId = this.roomId
+    this.fileService.addCameraPictureToChat(roomId);
   }
   addImage(){
-    this.fileService.addPictureToChat(this.roomId);
+    const roomId = this.roomId
+    this.fileService.addPictureToChat(roomId);
   }
   addFile(){
     this.fileService.addDocumentToChat(this.roomId);
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index 9a1c3a09a..e71d2f4d5 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -6,9 +6,9 @@
   </div>
   <div class="buttons">
     <button (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
-    <button hidden (click)="notImplemented()" class="btn-ok" shape="round" >Digitalizar Documento</button>
+    <button (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
     <button (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
-    <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Anexar Documento (G.D.)</button>
+    <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
     <div class="solid"></div>
     <button (click)="bookMeeting()" class="btn-ok" shape="round" >Novo Evento</button>
     <button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
index 7aea36628..27df26c1e 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
@@ -54,6 +54,15 @@ export class ChatOptionsPopoverPage implements OnInit {
     }
   }
 
+  addFile(){
+    if( window.innerWidth < 701){
+      this.popoverController.dismiss('add-document');
+    }
+    else{
+      this.modalController.dismiss('add-document');
+    }
+  }
+
   anexarFoto(){
     if( window.innerWidth < 701){
       this.popoverController.dismiss('add-picture');