diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 673d90771..53a891609 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -22,10 +22,10 @@
       <ion-icon class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
       <ion-label class="overflow-visible">Ações</ion-label>
     </ion-tab-button>
-    <!-- <ion-tab-button tab="chat">
+    <ion-tab-button tab="chat">
       <ion-icon class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
       <ion-label>Chat</ion-label>
-    </ion-tab-button> -->
+    </ion-tab-button>
   </ion-tab-bar>
 </ion-tabs>
 <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" rel="stylesheet">
diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html
index f263d160a..c84b4d793 100644
--- a/src/app/modals/add-note/add-note.page.html
+++ b/src/app/modals/add-note/add-note.page.html
@@ -7,23 +7,27 @@
 </ion-header>
 
 <ion-content>
-  <div class="main-content d-flex height-100">
+  <div class="ion-input-class-no-height">
+    <ion-textarea [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+  </div>
+
+  <!-- <div class="main-content d-flex height-100">
 
     <div class="content d-flex flex-column width-100">
       <div class="overflow-y-auto">
 
         <div class="container-div">
           <div class="ion-item-class-2 d-flex">
-            <div class="ion-icon-class">
+            <div hidden class="ion-icon-class">
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
-            <div class="ion-input-class-no-height width-100">
+            <div class="ion-input-class-no-height">
               <ion-textarea [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
             </div>
           </div>
         </div>
 
-        <div class="ion-item-container-no-border" (click)="getDoc()">
+        <div hidden class="ion-item-container-no-border" (click)="getDoc()">
           <ion-label class="d-flex align-center">
             <button class="btn-no-color">
             <div class="attach-icon d-flex align-center">
@@ -35,29 +39,29 @@
           </button>
           </ion-label>
         </div>
-  
-        <div class="list "  *ngFor="let document of documents; let i = index" > 
+
+        <div class="list "  *ngFor="let document of documents; let i = index" >
           <ion-list>
             <ion-item>
             <ion-label>
-              <p class="d-flex ion-justify-content-between"> 
-                <span class="attach-title-item">{{document.Assunto}}</span> 
-                <span class="app-name">{{document.appName}}</span> 
+              <p class="d-flex ion-justify-content-between">
+                <span class="attach-title-item">{{document.Assunto}}</span>
+                <span class="app-name">{{document.appName}}</span>
                 <span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
-              </p> 
+              </p>
               <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>
         </div>
       </div>
-      
-    </div>
-  </div>
 
-    
+    </div>
+  </div> -->
+
+
 
 
 
@@ -68,7 +72,7 @@
   </ion-item>
 
 </ion-content>
-<ion-footer>
+<ion-footer class="ion-no-border">
   <div class="buttons width-100">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
     <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
diff --git a/src/app/modals/add-note/add-note.page.scss b/src/app/modals/add-note/add-note.page.scss
index ac1cdefd1..04d427a30 100644
--- a/src/app/modals/add-note/add-note.page.scss
+++ b/src/app/modals/add-note/add-note.page.scss
@@ -11,7 +11,7 @@ color:#000;
 float: left;
 }
 .content{
-  padding: 30px 20px 0 20px !important;
+  //padding: 30px 20px 0 20px !important;
   margin: 0;
   float: left;
 
@@ -20,7 +20,7 @@ float: left;
     border: 1px solid #ebebeb;
     border-radius: 5px;
     padding-left: 10px;
-    
+
   }
   .ion-item-container-no-border{
     margin: 0px auto;
@@ -54,11 +54,7 @@ float: left;
     padding-right: 10px;
     float: left;
   }
-  .ion-input-class-no-height{
-    border: 1px solid #ebebeb;
-    border-radius: 5px;
-    overflow: auto;
-  }
+
   .list-people{
     width: 256px;
     float: left;
@@ -144,7 +140,15 @@ float: left;
 }
 .buttons{
   display: flex;
+  width: 100% !important;
   justify-content: space-between;
-  padding: 20px;
+  padding: 15px 0 15px 0;
   overflow: auto;
-}
\ No newline at end of file
+}
+
+.ion-input-class-no-height{
+  border: 1px solid #ebebeb;
+  border-radius: 5px;
+  overflow: auto;
+  margin: 5px 20px 0 20px !important;
+}
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
index 32e76d8b9..f4054a0d3 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
@@ -1,6 +1,6 @@
 <ion-header class="ion-no-border">
   <div class="header-content">
-    <div class="header-icon-left">
+    <div hidden class="header-icon-left">
       <button class="btn-no-color cursor-pointer" (click)="close()">
         <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
       </button>
@@ -12,11 +12,12 @@
 </ion-header>
 
 <ion-content>
-  <ion-item lines="none">
-    <ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Indique o que necessita ser revisto!"></ion-textarea>
-  </ion-item>
+  <div class="ion-input-class-no-height">
+    <ion-textarea [(ngModel)]="emendMessage" rows="6" cols="20" placeholder="Indique o que necessita ser revisto!"></ion-textarea>
+  </div>
+
 </ion-content>
-<ion-footer>
+<ion-footer class="ion-no-border">
   <div class="buttons width-100">
     <button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
     <button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
index 58229d622..8b39f5213 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
@@ -1,7 +1,7 @@
 .header-content{
     //width: 360px;
     overflow: auto;
-    margin: 25px auto;
+    margin-top: 25px;
   }
   .header-icon-left{
     width: 36px;
@@ -9,15 +9,17 @@
     color: #42b9fe;
     float: left;
   }
+
   .header-title{
     width: 264px;
     font-family: Roboto;
     font-size: 25px;
-    margin: 0 5px 0 5px;
+    margin: 0 5px 10px 20px;
     padding: 0;
     color:#000;
     float: left;
   }
+
 .buttons{
     width: 320px;
     margin: 0 auto;
@@ -37,12 +39,19 @@
     height: 44px;
     border-radius: 22.5px;
     --background: #42b9fe;
-    margin: 0 0px 0 12px; 
+    margin: 0 0px 0 12px;
   }
   .buttons{
     display: flex;
     width: 100% !important;
     justify-content: space-between;
-    padding: 15px;
+    padding: 15px 0 15px 0;
     overflow: auto;
-  }
\ No newline at end of file
+  }
+
+  .ion-input-class-no-height{
+    border: 1px solid #ebebeb;
+    border-radius: 5px;
+    overflow: auto;
+    margin: 0 20px 0 20px !important;
+  }
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index c773a151c..8ee94ec3b 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -43,7 +43,7 @@
           <ion-list *ngSwitchCase="'Contactos'">
             <ion-item-group>
               <ion-item-sliding>
-                  <div class="item width-100 d-flex" *ngFor="let dm of userDirectMessages">
+                  <ion-item class="item width-100 d-flex" *ngFor="let dm of userDirectMessages">
                     <div class="item-icon">
                       <ion-icon class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
                     </div>
@@ -62,7 +62,7 @@
                         <ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
                       </div>
                     </div>
-                  </div>
+                  </ion-item>
               </ion-item-sliding>
             </ion-item-group>
           </ion-list>
@@ -84,56 +84,66 @@
                         <ion-label>{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}</ion-label>
                       </div>
                     </div>
-                  </div>   
+                  </div>
               </ion-item-sliding>
             </ion-item-group>
-            
+
           </ion-list>
         </div>
-        <button (click)="sendMsg()" style="height: 41px;">Send message</button>
+       <!--  <button (click)="sendMsg()" style="height: 41px;">Send message</button> -->
         </div>
       </div>
       <!-- Aside right -->
       <div class="aside-content d-none flex-column height-100">
-        <app-empty-chat [texto]="emptyTextDescription" 
-          class="height-100 flex-column" 
+        <app-empty-chat [texto]="emptyTextDescription"
+          class="height-100 flex-column"
           [style.display]="showEmptyComponent ? 'flex' : 'none'"
           #messagecontainer>
         </app-empty-chat>
-        <app-messages class=" height-100 flex-column" 
-        [style.display]="showMessages ? 'flex' : 'none'"
-          [roomId]="roomId"  #messagecontainer>
+        <app-messages class=" height-100 flex-column"
+          *ngIf="showMessages"
+          [style.display]="showMessages ? 'flex' : 'none'"
+          (closeAllDesktopComponents)="closeAllDesktopComponents()"
+          (showEmptyContainer)="showEmptyContainer()"
+          [style.display]="showMessages ? 'flex' : 'none'"
+          [roomId]="roomId"
+          [showMessages]="showMessages"  #messagecontainer>
+          
         </app-messages>
-        <app-contacts 
-          (openMessage)="openMessagesPage($event)" 
+        <app-contacts
+          (openMessage)="openMessagesPage($event)"
+          *ngIf="showContacts"
           [style.display]="showContacts ? 'flex' : 'none'"
            class=" height-100 flex-column">
         </app-contacts>
-        <app-new-group 
-          (addGroupMessage)="openGroupContactsPage($event)" 
+        <app-new-group
+          (addGroupMessage)="openGroupContactsPage($event)"
           [style.display]="showNewGroup ? 'flex' : 'none'"
            class=" height-100 flex-column">
         </app-new-group>
         <app-edit-group [roomId]="roomId"
           (closeAllDesktopComponents)="closeAllDesktopComponents()"
           (openGroupMessage)="openGroupMessagesPage($event)"
+          *ngIf="showEditGroup"
           [style.display]="showEditGroup ? 'flex' : 'none'"
            class="height-100 flex-column">
         </app-edit-group>
-        <app-group-contacts 
-          (openGroupMessage)="openGroupMessagesPage($event)" 
+        <app-group-contacts
+          (openGroupMessage)="openGroupMessagesPage($event)"
+          *ngIf="showGroupContacts"
           [style.display]="showGroupContacts ? 'flex' : 'none'"
-          [roomId]="groupRoomId" class=" height-100 flex-column" 
+          [roomId]="groupRoomId" class=" height-100 flex-column"
           >
         </app-group-contacts>
         <app-group-messages
+          *ngIf="showGroupMessages"
         [style.display]="showEmptyComponent ? 'flex' : 'none'"
           (closeAllDesktopComponents)="closeAllDesktopComponents()"
           (showEmptyContainer)="showEmptyContainer()"
           (openGroupContacts)="openGroupContactsPage($event)"
           (openEditGroupPage)="openEditGroupPage($event)"
           [style.display]="showGroupMessages ? 'flex' : 'none'"
-          class=" height-100 flex-column" 
+          class=" height-100 flex-column"
           [roomId]="roomId" #messagecontainer>
         </app-group-messages>
       </div>
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index 09db58932..8e1d8545a 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -20,7 +20,7 @@ ion-content{
     }
     .div-icon{
       display: flex;
-      width: 50%;
+      width: fit-content;
       float: right;
       font-size: 35px;
       overflow: auto;
@@ -32,7 +32,7 @@ ion-content{
       padding-left: 20px;
     }
   }
-  
+
 
 .main-content{
   font-family: Roboto;
@@ -104,9 +104,9 @@ ion-content{
     color: #000;
   }
 }
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 801px) {
   .main-content{
-   
+
 
     .aside-wrapper{
       width: 35%;
@@ -131,7 +131,7 @@ ion-content{
         width: 90%;
       }
     }
-    
+
   }
 
 }
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index a8ffdb178..2e5485424 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { 
-  Component, 
+import {
+  Component,
   OnInit,
   ViewChild,
   ViewContainerRef,
@@ -36,7 +36,7 @@ export class ChatPage implements OnInit {
   options:any;
   X_User_Id:any;
   X_Auth_Token:any;
-  
+
   loggedUser: any;
   /* Set segment variable */
   segment:string;
@@ -76,7 +76,7 @@ export class ChatPage implements OnInit {
   /*
 
   Websockets variables
-  
+
   */
 
   subject: any;
@@ -100,15 +100,14 @@ export class ChatPage implements OnInit {
     private authService: AuthService,
     private storage:Storage,
     private resolver: ComponentFactoryResolver,
-    ){ 
+    ){
       this.loggedUserChat = authService.ValidatedUserChat['data'];
       this.headers = new HttpHeaders();
-      this.loadMessage();
     }
 
   ngOnInit() {
     console.log(this.loggedUserChat);
-    
+
     this.segment = "Contactos";
 
     this.authService.userData$.subscribe((res:any)=>{
@@ -116,12 +115,12 @@ export class ChatPage implements OnInit {
       console.log(this.loggedUser);
       this.load();
     });
-  
+
   /* websocket functions */
   //this.sendMsg();
 
   /* Fim websocket functions */
-  this.hideRefreshButton(); 
+  this.hideRefreshButton();
 }
 
 hideRefreshButton(){
@@ -140,16 +139,16 @@ hideRefreshButton(){
 }
 
 
-loadMessage(){
+/* loadMessage(){
   this.chatService.messages.subscribe(msg => {
     console.log("Response from websocket: " + msg);
   });
-}
-sendMsg() {
+} */
+/* sendMsg() {
   console.log("new message from client to websocket: ", this.message);
   this.chatService.messages.next(this.message);
   this.message.msg = "";
-}
+} */
 
 
   /* Fim websockets functions */
@@ -168,11 +167,9 @@ sendMsg() {
     this.showEmptyComponent=true;
   }
   openGroupContactsPage(data){
-    console.log(data);
     this.groupRoomId = data;
-    console.log(this.groupRoomId);
     this.closeAllDesktopComponents();
-    if(window.innerWidth <= 1024){
+    if(window.innerWidth < 801){
 
     }
     else{
@@ -180,8 +177,8 @@ sendMsg() {
     }
   }
   openMessagesPage(rid) {
-    if( window.innerWidth <= 1024){
-      //this.openMessagesModal(rid);
+    if( window.innerWidth < 801){
+      this.openMessagesModal(rid);
     }
     else{
       this.closeAllDesktopComponents();
@@ -193,8 +190,8 @@ sendMsg() {
   openContactsPage() {
     console.log('OK');
     this.closeAllDesktopComponents();
-    
-    if( window.innerWidth <= 1024){
+
+    if( window.innerWidth < 801){
       this.selectContact();
     }
     else{
@@ -203,7 +200,7 @@ sendMsg() {
     }
   }
   openNewGroupPage() {
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth < 801){
       this.newGroup();
     }
     else{
@@ -213,7 +210,7 @@ sendMsg() {
   }
 
   openEditGroupPage(rid) {
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth < 801){
       this.editGroup(rid);
     }
     else{
@@ -222,16 +219,17 @@ sendMsg() {
     }
   }
 
-  openGroupMessagesPage(data) {
-    console.log('HERE');
-    
-    if( window.innerWidth <= 1024){
-      this.openGroupMessagesModal(data);
+  openGroupMessagesPage(rid) {
+    console.log(rid);
+
+    if( window.innerWidth < 801){
+      this.openGroupMessagesModal(rid);
     }
     else{
       this.closeAllDesktopComponents();
       this.showEmptyComponent = false;
-      this.roomId = data;
+      this.roomId = rid;
+      console.log(this.roomId);
       this.showGroupMessages=true;
     }
   }
@@ -261,13 +259,13 @@ sendMsg() {
       console.log(res);
     });
   }
-  
+
   getDirectMessages(){
     this.showLoader = true;
-    
+
     this.chatService.getAllDirectMessages().subscribe((res:any)=>{
       console.log(res.ims);
-      
+
       this.userDirectMessages = res.ims.sort((a,b)=>{
         var dateA = new Date(a._updatedAt).getTime();
         var dateB = new Date(b._updatedAt).getTime();
@@ -288,7 +286,7 @@ sendMsg() {
       this.privateGroups = res.groups;
       this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{
       this.publicGroups = res.channels;
-      let all = this.privateGroups.concat(this.publicGroups); 
+      let all = this.privateGroups.concat(this.publicGroups);
       this.allGroups = all.sort((a,b)=>{
         var dateA = new Date(a._updatedAt).getTime();
         var dateB = new Date(b._updatedAt).getTime();
@@ -297,7 +295,7 @@ sendMsg() {
       console.log(this.allGroups);
       this.showLoader = false;
     });
-    }); 
+    });
   }
 
   async selectContact(){
@@ -337,7 +335,7 @@ sendMsg() {
     this.closeAllDesktopComponents();
 
     console.log(roomId);
-    
+
     const modal = await this.modalController.create({
       component: MessagesPage,
       cssClass: 'modal modal-desktop',
@@ -352,7 +350,7 @@ sendMsg() {
   async openGroupMessagesModal(roomId:any){
 
     console.log(roomId);
-    
+
     const modal = await this.modalController.create({
       component: GroupMessagesPage,
       cssClass: 'modal modal-desktop',
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index 3219a3666..ea8205336 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -37,11 +37,10 @@ export class GroupContactsPage implements OnInit {
     private chatService: ChatService,
     private authService: AuthService,
     private navParams: NavParams,
-  ) 
+  )
   {
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-    });     
+    this.loggedUser = authService.ValidatedUserChat['data'];
+
     this.textSearch="";
     this.dm=null;
     this.room=null;
@@ -95,7 +94,7 @@ export class GroupContactsPage implements OnInit {
 
 
   loadUsers(){
-    this.options = { 
+    this.options = {
       headers: this.headers,
     };
     this.chatService.getAllUsers().subscribe((res:any)=>{
@@ -115,7 +114,7 @@ export class GroupContactsPage implements OnInit {
         return 0;
       });
       console.log(this.users);
-      
+
       this.showLoader = false;
     });
   }
@@ -143,7 +142,7 @@ export class GroupContactsPage implements OnInit {
   async close(){
     this.modalController.dismiss();
     if(this.isGroupCreated){
-      console.log('go to conversa'); 
+      console.log('go to conversa');
     }
     else{
       this.modalController.dismiss();
@@ -167,12 +166,12 @@ export class GroupContactsPage implements OnInit {
   }
   clicked(){
     console.log('clicked');
-    
+
   }
   selectedContact(user:any){
   /*   this.groupName = this.room.name; */
     user.isChecked = !user.isChecked;
-  
+
 
   }
   addContacts(room:any){
@@ -185,11 +184,11 @@ export class GroupContactsPage implements OnInit {
       let body ={
         "roomId":room._id,
         "userId":user._id,
-        
+
       }
       this.chatService.addUserToGroup(body).subscribe(res=>{
         console.log(res['success']);
-      }); 
+      });
     });
   }
 
@@ -202,9 +201,9 @@ export class GroupContactsPage implements OnInit {
         console.log(res['group']);
         this.addContacts(res['group']);
         this.openGroupMessages(res['group']);
-        
+
       });
-      
+
     }
     else{
       this.addContacts(this.room);
@@ -212,12 +211,12 @@ export class GroupContactsPage implements OnInit {
       /* this.openGroupMessages(this.room); */
       /* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
         console.log(res);
-        
+
         this.addContacts(res['group']);
         this.openGroupMessages(res['group']);
       }) */
-      
-    } 
+
+    }
   }
 
   async newGroup(){
@@ -237,7 +236,7 @@ export class GroupContactsPage implements OnInit {
       component: GroupMessagesPage,
       componentProps: {
         room: room,
-      }, 
+      },
       cssClass: 'group-messages',
       backdropDismiss: false
     });
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 f192d0605..65b2582ff 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -10,7 +10,7 @@
           <button class="btn-no-color" (click)="openOptions()">
             <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </button>
-        </div>  
+        </div>
       </div>
       <div (click)="addContacts()" class="header-bottom">
         <div class="header-bottom-icon">
@@ -33,22 +33,25 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="welcome-text">
-    <ion-label>Esta conversa passou a grupo</ion-label><br />
-    <ion-label>A conversa original mantêm-se como chat individual</ion-label>
-  </div>
-  <div *ngFor="let msg of messages" class="messages">
-    <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
-      <div class="title">
-        <ion-label>{{msg.u.name}}</ion-label>
-        <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
-      </div>
-      <div>
-        <ion-label>{{msg.msg}}</ion-label>
-      </div>
+
+  <div class="messages overflow-y-auto" #scrollMe>
+    <div class="welcome-text">
+      <ion-label>Esta conversa passou a grupo</ion-label><br />
+      <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
-    <div *ngIf="msg.t == 'r'" class="info-text">
-      <ion-label>Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
+    <div *ngFor="let msg of messages" >
+      <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>
+        <div class="title">
+          <ion-label>{{msg.u.name}}</ion-label>
+          <span class="time">{{msg._updatedAt | date: 'HH:mm' }}</span>
+        </div>
+        <div>
+          <ion-label>{{msg.msg}}</ion-label>
+        </div>
+      </div>
+      <div *ngIf="msg.t == 'r'" class="info-text">
+        <ion-label>Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
+      </div>
     </div>
   </div>
   <div *ngIf="leaveStatus" class="info-text-leave">
@@ -56,7 +59,7 @@
   </div>
 
 </ion-content>
-<!-- 
+<!--
 <ion-footer>
   <ion-toolbar>
     <ion-row align-items-center class="row">
@@ -90,7 +93,7 @@
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
         <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <button class="btn-no-color" (click)="notImplemented()">
+        <button hidden class="btn-no-color">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>
       </ion-item>
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index 4d9f6849f..2e59497b7 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -14,7 +14,7 @@
         padding: 30px 20px 0px 20px;
         color:#000;
         transform: translate3d(0, 1px, 0);
-        
+
         .header-top{
           overflow: auto;
           padding: 0 !important;
@@ -57,7 +57,7 @@
             margin: 1px;
           }
         }
-    
+
         .title{
           font-size: 25px;
         }
@@ -71,7 +71,7 @@
         .div-icon ion-icon{
           float: right;
           padding-left: 20px;
-        } 
+        }
     }
  }
  ion-content{
@@ -124,6 +124,17 @@
     font-family: Roboto;
     overflow: auto;
 
+    //set scroll do bottom
+    position: absolute;
+    top: 0;
+    left: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+    width: 100%;
+    height: 100%;
+    word-wrap: break-word;
+    -webkit-overflow-scrolling: touch;
+
     .incoming-true, .incoming-false{
       width: 305px;
        padding: 15px 20px;
@@ -143,7 +154,7 @@
      }
      .title{
       color: #0782c9;
-      
+
       font-weight: bold;
       margin-bottom: 5px;
 
@@ -176,9 +187,9 @@
  .container{
    justify-content: center;
    justify-content: space-evenly;
-   
+
  }
- 
+
  .chat-icon-options{
    display:block !important;
    font-size: 25px;
@@ -205,5 +216,5 @@
      align-self: center;
    }
  }
- 
-}
\ No newline at end of file
+
+}
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 e5132050a..6235a3423 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked } from '@angular/core';
 import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
@@ -8,13 +8,14 @@ import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popove
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { NewGroupPage } from '../new-group/new-group.page';
 import { GroupContactsPage } from './group-contacts/group-contacts.page';
+import {Router} from '@angular/router'
 
 @Component({
   selector: 'app-group-messages',
   templateUrl: './group-messages.page.html',
   styleUrls: ['./group-messages.page.scss'],
 })
-export class GroupMessagesPage implements OnInit {
+export class GroupMessagesPage implements OnInit, AfterViewChecked {
   showLoader: boolean;
   isGroupCreated:boolean;
   loggedUser: any;
@@ -28,6 +29,9 @@ export class GroupMessagesPage implements OnInit {
   contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
 
   roomId: string;
+  loggedUserChat:any;
+
+  @ViewChild('scrollMe') private myScrollContainer: ElementRef;
 
   constructor(
     private menu: MenuController,
@@ -38,21 +42,29 @@ export class GroupMessagesPage implements OnInit {
     private navParams: NavParams,
     private authService: AuthService,
     private alertService: AlertService,
+    private route: Router
   ) {
+    this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
     this.roomId = this.navParams.get('roomId');
   }
 
   ngOnInit() {
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-      console.log(this.loggedUser); 
-    });
+    console.log(this.roomId);
+    this.loggedUser=this.loggedUserChat;
     this.getRoomInfo();
+    this.scrollToBottom();
+    this.serverLongPull();
   }
 
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  ngAfterViewChecked() {
+    //this.scrollToBottom();
+  }
+
+  scrollToBottom(): void {
+    try {
+      this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
+    } catch(err) { }
   }
 
   getRoomInfo(){
@@ -119,19 +131,15 @@ export class GroupMessagesPage implements OnInit {
     }
   }
   sendMessage(){
-
     let body = {
-      "message": 
-      { 
-        "rid": this.roomId, "msg": this.message 
-      }
+      "message": { "rid": this.roomId, "msg": this.message }
     }
-    
+
     this.chatService.sendMessage(body).subscribe(res=> {
       this.getRoomInfo();
-    
+
     },(error) => {
-      
+
     });
     this.message = "";
   }
@@ -154,7 +162,7 @@ export class GroupMessagesPage implements OnInit {
         console.log('cancel');
       }
       console.log('OK2');
-      
+
     });
   }
 
@@ -172,7 +180,7 @@ export class GroupMessagesPage implements OnInit {
   }
   async addContacts(){
     console.log(this.members);
-  
+
     const modal = await this.modalController.create({
       component: GroupContactsPage,
       componentProps: {
@@ -180,7 +188,7 @@ export class GroupMessagesPage implements OnInit {
         room: this.room,
         members: this.members,
         name: this.room.name,
-      }, 
+      },
       cssClass: 'contacts',
       backdropDismiss: false
     });
@@ -211,11 +219,43 @@ export class GroupMessagesPage implements OnInit {
         handler: () => {
           console.log('Play clicked');
         }
-      }, 
+      },
       ]
     });
     await actionSheet.present();
   }
  */
 
+  async serverLongPull(){
+    this.chatService.getPrivateGroupMessages(this.roomId).subscribe(async res => {
+
+    if (res == 502) {
+      // Connection timeout
+      // happens when the connection was pending for too long
+      // let's reconnect
+      await this.serverLongPull();
+    } else if (res != 200) {
+      // Show Error
+      //showMessage(response.statusText);
+      //this.loadMessages()
+      this.messages = res['messages'].filter(data => data.t != 'au');
+      console.log(this.messages);
+      // Reconnect in one second
+      if(this.route.url != "/home/chat"){
+        console.log("Timer message stop")
+      } else {
+         await new Promise(resolve => setTimeout(resolve, 1000));
+        await this.serverLongPull();
+        console.log('Timer message running')
+      }
+
+    } else {
+      // Got message
+      //let message = await response.text();
+      //this.loadMessages()
+      await this.serverLongPull();
+    }
+  });
+  }
+
 }
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index 4a236340a..e0f7b0891 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -28,11 +28,10 @@ export class ContactsPage implements OnInit {
     private http: HttpClient,
     private chatService: ChatService,
     private authService: AuthService,
-  ) 
-  {  
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-    });
+  )
+  {
+    this.loggedUser = authService.ValidatedUserChat['data'];
+
     this.textSearch="";
     this.dm=null;
     this.room=null;
@@ -47,7 +46,7 @@ export class ContactsPage implements OnInit {
   }
 
   loadUsers(){
-    this.options = { 
+    this.options = {
       headers: this.headers,
     };
     this.chatService.getAllUsers().subscribe((res:any)=>{
@@ -86,7 +85,7 @@ export class ContactsPage implements OnInit {
   close(){
     this.modalController.dismiss();
   }
-  
+
   clicked(){
     console.log('clicked');
   }
@@ -99,17 +98,17 @@ export class ContactsPage implements OnInit {
       console.log(res);
       this.room = res['room'];
       console.log(this.room._id);
-      
+
       this.getDirectMessage(this.room._id);
     });
   }
   getDirectMessage(roomId:any){
     console.log(roomId);
-    
+
     this.chatService.getAllDirectMessages().subscribe(res=>{
       let result = res['ims'].filter(data => data._id == roomId);
       console.log(result[0]);
-      
+
       this.dm = result[0];
       console.log(this.dm);
       this.openModal(this.dm._id);
@@ -118,7 +117,7 @@ export class ContactsPage implements OnInit {
   async openModal(roomId:any){
     this.close();
     console.log(roomId);
-    
+
     const modal = await this.modalController.create({
       component: MessagesPage,
       cssClass: 'group-messages',
@@ -139,8 +138,8 @@ export class ContactsPage implements OnInit {
     //Get direct messages (dm)
     /* this.getDirectMessage(this.room._id); */
     console.log(this.dm);
-    
-      
+
+
     /* const modal = await this.modalController.create({
       component: MessagesPage,
       cssClass: 'group-messages',
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index dd94a44dc..5f3dbf293 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -15,7 +15,7 @@
           <button class="btn-no-color" (click)="openMessagesOptions()">
             <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </button>
-        </div>  
+        </div>
       </div>
       <div hidden class="header-bottom" (click)="addContacts()">
         <div class="header-bottom-icon">
@@ -82,8 +82,8 @@
     <div class="width-70">
       <ion-item class="ion-no-padding ion-no-margin type-message" lines="none">
         <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <button class="btn-no-color" (click)="notImplemented()">
-          <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
+        <button hidden class="btn-no-color" (click)="notImplemented()">
+         <!--  <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon> -->
         </button>
       </ion-item>
     </div>
@@ -96,4 +96,4 @@
       </button>
     </div>
   </div>
-</ion-footer>
\ No newline at end of file
+</ion-footer>
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 284f62881..6dbb2047f 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -1,4 +1,5 @@
 import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import {Router} from '@angular/router'
 import { ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Status } from 'src/app/models/chat/status.model';
 import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
@@ -26,8 +27,9 @@ export class MessagesPage implements OnInit, AfterViewChecked {
   userPresence='';
   dmUsers:any;
   roomId:string;
+  el:any;
+
 
-  
   constructor(
     public popoverController: PopoverController,
     private modalController: ModalController,
@@ -36,7 +38,9 @@ export class MessagesPage implements OnInit, AfterViewChecked {
     private authService: AuthService,
     private alertService: AlertService,
     private toastService: ToastService,
-  ) { 
+    private route: Router
+  ) {
+    this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
   }
 
@@ -44,15 +48,12 @@ export class MessagesPage implements OnInit, AfterViewChecked {
 
     this.scrollToBottom();
 
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-      console.log(this.loggedUser); 
-    });
-    
     /* setInterval(()=>{ */
       this.load();
     /* }, 9000); */
-    
+    /* this.el = document.getElementById("scrollToBottom");
+    this.el.scrollTop = this.el.scrollHeight - this.el.scrollTop; */
+
   }
 
   notImplemented(){
@@ -62,42 +63,40 @@ export class MessagesPage implements OnInit, AfterViewChecked {
   close(){
     this.modalController.dismiss();
   }
+
   load(){
-    this.loadMessages();
+    this.serverLongPull();
     this.getChatMembers();
   }
+
   doRefresh(ev:any){
     this.load();
     ev.target.complete();
   }
-  
-  ngAfterViewChecked() {        
-    this.scrollToBottom();
-  } 
-  scrollToBottom(): void {
 
+  ngAfterViewChecked() {
+    //this.scrollToBottom();
+  }
+
+  scrollToBottom(): void {
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
-    } catch(err) { }     
-
-  }
-  loadMoreMessages(ev:any){
-
+    } catch(err) { }
   }
 
   sendMessage(){
     let body = {
-      "message": 
-      { 
-        "rid": this.roomId, "msg": this.message 
+      "message":
+      {
+        "rid": this.roomId, "msg": this.message
       }
     }
     this.chatService.sendMessage(body).subscribe(res=> {
-      this.loadMessages(); 
+      this.loadMessages();
     });
     this.message = "";
   }
-  
+
   loadMessages(){
     this.showLoader = true;
     this.chatService.getRoomMessages(this.roomId).subscribe(res => {
@@ -133,7 +132,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
   async addContacts(){
     const modal = await this.modalController.create({
       component: ContactsPage,
-      componentProps: {}, 
+      componentProps: {},
       cssClass: 'contacts',
       backdropDismiss: false
     });
@@ -153,4 +152,36 @@ async openChatOptions(ev?: any) {
     return await popover.present();
   }
 
-}
\ No newline at end of file
+  async serverLongPull(){
+    this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
+
+    if (res == 502) {
+      // Connection timeout
+      // happens when the connection was pending for too long
+      // let's reconnect
+      await this.serverLongPull();
+    } else if (res != 200) {
+      // Show Error
+      //showMessage(response.statusText);
+      //this.loadMessages()
+      this.messages = res['messages'].reverse();
+      console.log(this.messages);
+      // Reconnect in one second
+      if(this.route.url != "/home/chat"){
+        console.log("Timer message stop")
+      } else {
+         await new Promise(resolve => setTimeout(resolve, 1000));
+        await this.serverLongPull();
+        console.log('Timer message running')
+      }
+
+    } else {
+      // Got message
+      //let message = await response.text();
+      //this.loadMessages()
+      await this.serverLongPull();
+    }
+  });
+  }
+
+}
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 31c55ea0c..573c588e3 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -310,7 +310,7 @@ export class DespachoPage implements OnInit {
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
     } else  {
-      classs = 'modal modal-desktop'
+      classs = 'add-note-modal'
     }
     const modal = await this.modalController.create({
       component: AddNotePage,
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts
index 745848461..fab3425e1 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts
@@ -26,7 +26,7 @@ export class PublicationDetailPage implements OnInit {
     private publications:PublicationsService,
     private animationController: AnimationController,
     private toastService: ToastService
-    ) { 
+    ) {
       this.publicationId = this.navParams.get('publicationId');
       /* this.folderId = this.navParams.get('folderIdId'); */
       this.publication = {
@@ -98,8 +98,7 @@ export class PublicationDetailPage implements OnInit {
   }
 
   async editPost(publicationType:any) {
-    console.log('HERE');
-    
+
     console.log(this.publication);
     const modal = await this.modalController.create({
       component: NewPublicationPage,
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 2a69c3907..af5b6a178 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -30,7 +30,7 @@ export class AuthService {
     public alertController: AlertController,
     private localstoreService: LocalstoreService,
     private toastService: ToastService,
-    ) { 
+    ) {
 
       this.headers = new HttpHeaders();
 
@@ -43,7 +43,7 @@ export class AuthService {
       }
 
     }
-    
+
 
     async login(user: UserForm): Promise<boolean> {
       //user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password);
@@ -56,7 +56,7 @@ export class AuthService {
         headers: this.headers,
       }
       const service = environment.apiURL + "userauthentication/GetValidateAuth";
-      
+
       let result: boolean | PromiseLike<boolean> = false;
       let response: any;
 
@@ -80,7 +80,7 @@ export class AuthService {
 
           return true;
         }
-        
+
       } catch (error) {
         if(error.status ==  0) {
           this.toastService.badRequest('Verifique a sua conexão com a internet e volte a tentar')
@@ -89,7 +89,7 @@ export class AuthService {
         }
         return false;
       }
-      
+
     }
 
     logout(){
@@ -103,6 +103,8 @@ export class AuthService {
         "password": user.password,
       }
 
+      console.log(postData);
+
       let responseChat = await this.httpService.post('login', postData).toPromise();
       if(responseChat){
         console.log('Login to Rocket chat OK');
@@ -155,7 +157,7 @@ export class AuthService {
         message: message,
         buttons: ['OK']
       });
-  
+
       await alert.present();
     }
 }
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 838225d47..189a37314 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -20,9 +20,10 @@ export class ChatService {
   X_User_Id:any;
   X_Auth_Token:any;
 
-  SERVER_URL = 'wss://www.tabularium.pt/websocket';
-  public messages: Subject<any>;
+  //SERVER_URL = 'wss://www.tabularium.pt/websocket';
+  //public messages: Subject<any>;
   loggedUserChat:any;
+  bindOnMessage: any;
 
   constructor(
     private http:HttpClient,
@@ -30,7 +31,7 @@ export class ChatService {
     private authService: AuthService,
     private storage: Storage,
     private storageService:StorageService,
-    private wsService: WebsocketService,
+    //private wsService: WebsocketService,
     )
     {
       this.loggedUserChat = authService.ValidatedUserChat;
@@ -41,13 +42,13 @@ export class ChatService {
         headers: this.headers,
       };
 
-      this.messages = <Subject<any>>this.wsService.connect(this.SERVER_URL).map((response: MessageEvent): any => {
+      /* this.messages = <Subject<any>>this.wsService.connect(this.SERVER_URL).map((response: MessageEvent): any => {
           let data = JSON.parse(response.data);
           console.log(data);
           return (JSON.stringify(data));
-        });
+        }); */
     }
-    
+
     getAllChannels(){
       return this.http.get(environment.apiChatUrl+'channels.list', this.options);
     }
@@ -61,17 +62,17 @@ export class ChatService {
     getRoomInfo(roomId:any){
       let params = new HttpParams();
       params = params.set("roomId", roomId);
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'rooms.info', opts);
-      
+
     }
     customsRooms(params:any){
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'rooms.get', opts);
     }
@@ -95,22 +96,22 @@ export class ChatService {
 
       let params = new HttpParams();
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'im.history', opts);
     }
 
     sendMessage(body:any){
-      let opts = { 
+      let opts = {
         headers: this.headers,
       }
       return this.http.post(environment.apiChatUrl+'chat.sendMessage', body, opts);
     }
     leaveRoom(body:any){
-      let opts = { 
+      let opts = {
         headers: this.headers,
       }
       return this.http.post(environment.apiChatUrl+'rooms.leave', body, opts);
@@ -120,15 +121,15 @@ export class ChatService {
 
       let params = new HttpParams();
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'im.members', opts);
     }
     removeChatRoom(body:any){
-      let opts = { 
+      let opts = {
         headers: this.headers,
       }
       return this.http.post(environment.apiChatUrl+'im.close', body, this.options);
@@ -139,10 +140,10 @@ export class ChatService {
     getDirectMessage(roomId:string){
       let params = new HttpParams();
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'im.messages', opts);
     }
@@ -155,10 +156,10 @@ export class ChatService {
       let params = new HttpParams();
       let url=environment.apiChatUrl+'groups.members';
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(url, opts);
     }
@@ -166,10 +167,10 @@ export class ChatService {
       let params = new HttpParams();
       let url=environment.apiChatUrl+'channels.members';
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(url, opts);
     }
@@ -178,20 +179,20 @@ export class ChatService {
 
       let params = new HttpParams();
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'groups.history', opts);
     }
     getPublicGroupMessages(roomId:any){
       let params = new HttpParams();
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'channels.history', opts);
     }
@@ -208,7 +209,7 @@ export class ChatService {
       return this.http.post(environment.apiChatUrl+'channels.leave', body, this.options);
     }
     removeChannelMember(body:any){
-      let opts = { 
+      let opts = {
         headers: this.headers,
       }
       return this.http.post(environment.apiChatUrl+'channels.kick', body, opts);
@@ -225,10 +226,10 @@ export class ChatService {
     getGroupInfo(roomId:any){
       let params = new HttpParams();
       params = params.set("roomId", roomId);
-    
-      let opts = { 
-        headers: this.headers, 
-        params: params 
+
+      let opts = {
+        headers: this.headers,
+        params: params
       }
       return this.http.get(environment.apiChatUrl+'groups.info', opts);
     }
@@ -236,10 +237,46 @@ export class ChatService {
       return this.http.post(environment.apiChatUrl+'groups.rename', body, this.options);
     }
     removeGroupMember(body:any){
-      let opts = { 
+      let opts = {
         headers: this.headers,
       }
       return this.http.post(environment.apiChatUrl+'groups.kick', body, opts);
     }
 
+    async subscribe(roomId:any) {
+      console.log('Subcrive')
+      let params = new HttpParams();
+      params = params.set("roomId", roomId);
+      let opts = { 
+        headers: this.headers, 
+        params: params 
+      }
+
+      this.http.get(environment.apiChatUrl+'im.messages', opts).subscribe(async res => {
+        console.log("Subcrive", res)
+
+        if (res == 502) {
+          // Connection timeout
+          // happens when the connection was pending for too long
+          // let's reconnect
+          await this.subscribe(roomId);
+        } else if (res != 200) {
+          // Show Error
+          //showMessage(response.statusText);
+          this.getRoomMessages(roomId)
+          // Reconnect in one second
+          await new Promise(resolve => setTimeout(resolve, 1000));
+          await this.subscribe(roomId);
+        } else {
+          // Got message
+          //let message = await response.text();
+          this.getRoomMessages(roomId)
+          await this.subscribe(roomId);
+        }
+
+      })
+  
+     
+    }
+
 }
diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts
index a4a9d8471..424a6914e 100644
--- a/src/app/services/websocket.service.ts
+++ b/src/app/services/websocket.service.ts
@@ -25,7 +25,7 @@ export class WebsocketService {
     let ws = new WebSocket(url);
 
     console.log(ws);
-    
+
 
     let observable = Rx.Observable.create((obs: Rx.Observer<MessageEvent>) => {
       ws.onmessage = obs.next.bind(obs);
diff --git a/src/app/shared/chat/edit-group/edit-group.page.ts b/src/app/shared/chat/edit-group/edit-group.page.ts
index 0674396eb..ac24f8951 100644
--- a/src/app/shared/chat/edit-group/edit-group.page.ts
+++ b/src/app/shared/chat/edit-group/edit-group.page.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController, PickerController } from '@ionic/angular';
+import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
 
 @Component({
@@ -14,6 +15,7 @@ export class EditGroupPage implements OnInit {
   selectedDuration = ['','',''];
   groupName:string;
   room:any;
+  loggedUser: any;
   @Input() roomId:string;
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
   @Output() openGroupMessage:EventEmitter<any> = new EventEmitter<any>();
@@ -23,7 +25,9 @@ export class EditGroupPage implements OnInit {
     private modalController: ModalController,
     private pickerController: PickerController,
     private chatService: ChatService,
+    private authService: AuthService,
   ) {
+    this.loggedUser = authService.ValidatedUserChat['data'];
    }
 
   ngOnInit() {
@@ -58,7 +62,7 @@ export class EditGroupPage implements OnInit {
     else{
       console.log("Invalid name!");
     }
-    this.close();  
+    this.close();
   }
 
   _ionChange(event){
@@ -68,11 +72,11 @@ export class EditGroupPage implements OnInit {
     const picker = await this.pickerController.create({
       cssClass: '',
       buttons: [
-          { 
+          {
             text: 'Cancelar', role: 'cancel', cssClass: 'btn-cancel'
           },
-          { 
-            text: 'Ok', 
+          {
+            text: 'Ok',
             cssClass: 'btn-cancel',
             handler:(value:any)=>{
               console.log('button done pressed');
@@ -86,24 +90,24 @@ export class EditGroupPage implements OnInit {
                 if(value.days.value > 0){
                   if(value.days.value == 1){
                     if(value.hours.value == 1){
-                      this.displayDuration = value.days.value  + " day " +  
+                      this.displayDuration = value.days.value  + " day " +
                       value.hours.value + " hora " +
                       value.minutes.value + " minutos";
                     }
                     else{
-                      this.displayDuration = value.days.value  + " days " + 
+                      this.displayDuration = value.days.value  + " days " +
                       value.hours.value + " horas " +
                       value.minutes.value + " minutos";
                     }
                   }
                   else{
                     if(value.hours.value == 1){
-                      this.displayDuration = value.days.value  + " days " +  
+                      this.displayDuration = value.days.value  + " days " +
                       value.hours.value + " hora " +
                       value.minutes.value + " minutos";
                     }
                     else{
-                      this.displayDuration = value.days.value  + " days " + 
+                      this.displayDuration = value.days.value  + " days " +
                       value.hours.value + " horas " +
                       value.minutes.value + " minutos";
                     }
@@ -119,7 +123,7 @@ export class EditGroupPage implements OnInit {
                     value.minutes.value + " minutos";
                   }
                 }
-              } 
+              }
             },
         },
       ],
@@ -173,7 +177,7 @@ export class EditGroupPage implements OnInit {
     await picker.present();
     picker.onDidDismiss().then(async data =>{
       let day = await picker.getColumn('days');
-      let hour = await picker.getColumn('hours'); 
+      let hour = await picker.getColumn('hours');
       let minutes = await picker.getColumn('minutes');
     });
 
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index 8afcba99f..916f3ad3e 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -40,11 +40,9 @@ export class GroupContactsPage implements OnInit {
     private chatService: ChatService,
     private authService: AuthService,
     //private navParams: NavParams,
-  ) 
+  )
   {
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-    });     
+    this.loggedUser = authService.ValidatedUserChat['data'];
     this.textSearch="";
     this.dm=null;
     this.room=null;
@@ -56,9 +54,9 @@ export class GroupContactsPage implements OnInit {
 
   ngOnInit() {
     //this.getRoomInfo();
-    //this.loadUsers();
+    this.loadUsers();
     console.log(this.roomId);
-    this.getChatInfo(); 
+    this.getChatInfo();
     //console.log(this.isGroupCreated);
   }
 
@@ -72,7 +70,7 @@ export class GroupContactsPage implements OnInit {
   }
   deleteMember(data:any){
     console.log(data);
-    
+
     let body = {
       "roomId": this.roomId,
       "userId": data._id,
@@ -100,7 +98,7 @@ export class GroupContactsPage implements OnInit {
     this.chatService.getRoomInfo(this.roomId).subscribe(res=>{
       console.log(res);
       let room = res['room'];
-      
+
       if(room.t == "p"){
         this.chatService.getGroupMembers(this.roomId).subscribe(res=>{
           this.members = res['members'];
@@ -148,7 +146,7 @@ export class GroupContactsPage implements OnInit {
   }
 
   loadUsers1(members:any){
-    this.options = { 
+    this.options = {
       headers: this.headers,
     };
     this.chatService.getAllUsers().subscribe((res:any)=>{
@@ -161,7 +159,7 @@ export class GroupContactsPage implements OnInit {
       else{
         this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
       }
-      
+
       this.users = this.contacts.sort((a,b) => {
         if(a.name < b.name){
           return -1;
@@ -172,13 +170,13 @@ export class GroupContactsPage implements OnInit {
         return 0;
       });
       console.log(this.users);
-      
+
       this.showLoader = false;
     });
   }
 
   loadUsers(){
-    this.options = { 
+    this.options = {
       headers: this.headers,
     };
     this.chatService.getAllUsers().subscribe((res:any)=>{
@@ -191,7 +189,7 @@ export class GroupContactsPage implements OnInit {
       else{
         this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
       }
-      
+
       this.users = this.contacts.sort((a,b) => {
         if(a.name < b.name){
           return -1;
@@ -202,7 +200,7 @@ export class GroupContactsPage implements OnInit {
         return 0;
       });
       console.log(this.users);
-      
+
       this.showLoader = false;
     });
   }
@@ -228,7 +226,7 @@ export class GroupContactsPage implements OnInit {
   async close(){
     this.modalController.dismiss();
     if(this.isGroupCreated){
-      console.log('go to conversa'); 
+      console.log('go to conversa');
     }
     else{
       this.modalController.dismiss();
@@ -272,7 +270,7 @@ export class GroupContactsPage implements OnInit {
       }
       this.chatService.addUserToGroup(body).subscribe(res=>{
         console.log(res['success']);
-      }); 
+      });
     });
   }
 
@@ -285,14 +283,14 @@ export class GroupContactsPage implements OnInit {
         console.log(res['group']);
         this.addContacts(res['group']);
         this.openGroupMessages(res['group']);
-        
+
       });
-      
+
     }
     else{
       this.addContacts(this.room);
-      this.close(); 
-    } 
+      this.close();
+    }
   } */
 
   async newGroup(){
@@ -312,7 +310,7 @@ export class GroupContactsPage implements OnInit {
       component: GroupMessagesPage,
       componentProps: {
         room: room,
-      }, 
+      },
       cssClass: 'group-messages',
       backdropDismiss: false
     });
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 43682e735..1df0d7960 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -9,7 +9,7 @@
           <button class="btn-no-color" (click)="openGroupMessagesOptions()">
             <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </button>
-        </div>  
+        </div>
       </div>
       <div (click)="openGroupContactsPage()" class="header-bottom">
         <div class="header-bottom-icon">
@@ -32,12 +32,13 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="welcome-text">
-    <ion-label> {{message}} Esta conversa passou a grupo</ion-label><br />
-    <ion-label>A conversa original mantêm-se como chat individual</ion-label>
-  </div>
-  <div class="messages">
-    <div class="container-width-100" *ngFor="let msg of messages">
+
+  <div class="messages overflow-y-auto" #scrollMe>
+    <div class="welcome-text">
+      <ion-label> Esta conversa passou a grupo</ion-label><br />
+      <ion-label>A conversa original mantêm-se como chat individual</ion-label>
+    </div>
+    <div class="container-width-100" *ngFor="let msg of messages" #scrollMe>
       <div *ngIf="msg.t != 'r'" class='incoming-{{msg.u.username!=loggedUser.me.username}} max-width-45'>
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
@@ -59,6 +60,7 @@
 </ion-content>
 
 <ion-footer>
+  <ion-label>{{message}}</ion-label>
   <div class="container width-100 d-flex">
     <div>
       <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
@@ -67,8 +69,8 @@
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
-        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <button class="btn-no-color" (click)="notImplemented()">
+        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
+        <button hidden class="btn-no-color">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>
       </ion-item>
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index 77fcebb70..46a69b6a8 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -10,7 +10,7 @@
         padding: 30px 20px 0px 20px;
         color:#000;
         //transform: translate3d(0, 1px, 0);
-        
+
         .header-top{
           width: 100%;
           overflow: auto;
@@ -52,7 +52,7 @@
             margin: 1px;
           }
         }
-    
+
         .title{
           font-size: 25px;
         }
@@ -66,7 +66,7 @@
         .div-icon ion-icon{
           float: right;
           padding-left: 20px;
-        } 
+        }
     }
  }
  ion-content{
@@ -117,7 +117,8 @@
    .messages{
     font-size: 13px;
     font-family: Roboto;
-    overflow: auto;
+    width: 100%;
+    height: 100%;
 
     .incoming-true, .incoming-false{
        padding: 15px 20px;
@@ -159,9 +160,9 @@
  .container{
    justify-content: center;
    justify-content: space-evenly;
-   
+
  }
- 
+
  .chat-icon-options{
    display:block !important;
    font-size: 25px;
@@ -183,10 +184,13 @@
    align-items: center;
    overflow: auto;
 
+
    ion-textarea{
+     min-height: 50px;
      margin: 0 !important;
      align-self: center;
+     overflow: auto;
    }
  }
- 
+
 }
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 2fa69fa06..8affbd4de 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter} from '@angular/core';
+import { Component, OnChanges, OnInit, Input, SimpleChanges, Output, EventEmitter, ViewChild, ElementRef, AfterViewChecked} from '@angular/core';
 import { ActionSheetController, AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
@@ -8,31 +8,35 @@ import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popove
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { NewGroupPage } from '../new-group/new-group.page';
 import { GroupContactsPage } from './group-contacts/group-contacts.page';
+import { Router } from '@angular/router'
 
 @Component({
   selector: 'app-group-messages',
   templateUrl: './group-messages.page.html',
   styleUrls: ['./group-messages.page.scss'],
 })
-export class GroupMessagesPage implements OnInit, OnChanges {
+export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
   showLoader: boolean;
   isGroupCreated:boolean;
   loggedUser: any;
   message:any;
   leaveStatus:any;
   messages:any;
-  
 
-  room:any;
+
+  room:any = new Array();
   roomName:any;
   members:any;
 
+  loggedUserChat:any;
   @Input() roomId:string;
   @Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
   @Output() showEmptyContainer:EventEmitter<any> = new EventEmitter<any>();
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
   @Output() openEditGroupPage:EventEmitter<any> = new EventEmitter<any>();
 
+  @ViewChild('scrollMe') private myScrollContainer: ElementRef;
+
   constructor(
     private menu: MenuController,
     private modalController: ModalController,
@@ -42,24 +46,33 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     private authService: AuthService,
     private animationController: AnimationController,
     private alertService: AlertService,
+    private route: Router
   ) {
+    this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
   }
   ngOnChanges(changes: SimpleChanges): void {
     this.getRoomInfo();
+    this.scrollToBottom();
   }
 
   ngOnInit() {
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-      console.log(this.loggedUser); 
-    });
+    this.loggedUser=this.loggedUserChat;
     this.getRoomInfo();
+    this.serverLongPull();
     console.log(this.roomId);
   }
 
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  ngAfterViewChecked() {
+    //this.scrollToBottom();
+  }
+
+  scrollToBottom(): void {
+    try {
+      this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
+    } catch(err) { }
+    finally {
+    }
   }
 
   openGroupContactsPage(){
@@ -74,17 +87,20 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     this.getRoomInfo();
     ev.target.complete();
   }
+
   get watch(){
     this.getRoomInfo();
     console.log('here watching');
-    
+
     return this.roomId;
   }
   getRoomInfo(){
     this.showLoader = true;
     this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
       this.room = room['room'];
-      this.roomName = this.room.name.split('-').join(' ');
+      if(this.room.name){
+        this.roomName = this.room.name.split('-').join(' ');
+      }
       this.getGroupContacts(this.room);
       this.loadGroupMessages(this.room);
       this.showLoader = false;
@@ -112,18 +128,18 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   }
   loadGroupMessages(room:any){
     console.log('here'+room.t);
-    
+
     this.showLoader = true;
     //If group is private call getGroupMembers
     if(room.t === 'p'){
       console.log('private');
-      
+
       this.chatService.getPrivateGroupMessages(this.roomId).subscribe(res=>{
         console.log(res);
         let msgOnly = res['messages'].filter(data => data.t != 'au');
         this.messages = msgOnly.reverse();
         console.log(res);
-        
+
         this.showLoader = false;
       });
     }
@@ -138,14 +154,14 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   sendMessage(){
 
     let body = {
-      "message": 
-      { 
-        "rid": this.roomId, "msg": this.message 
+      "message":
+      {
+        "rid": this.roomId, "msg": this.message
       }
     }
-    
+
     this.chatService.sendMessage(body).subscribe(res=> {
-     /*  this.loadGroupMessages(); */ 
+     /*  this.loadGroupMessages(); */
      this.getRoomInfo();
     });
     this.message = "";
@@ -174,7 +190,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     const leaveAnimation = (baseEl: any) => {
       return enterAnimation(baseEl).direction('reverse');
     }
- 
+
 
     /* const popover = await this.popoverController.create({
       component: MessagesOptionsPage,
@@ -217,11 +233,11 @@ export class GroupMessagesPage implements OnInit, OnChanges {
       else{
         this.roomName = res.data.name.split('-').join(' ');
         console.log(this.roomName);
-        
+
         this.getRoomInfo();
         //this.modalController.dismiss();
       };
-      
+
     });
   }
 
@@ -252,9 +268,9 @@ export class GroupMessagesPage implements OnInit, OnChanges {
       console.log(res);
       if(res.data){
         this.getRoomInfo();
-        //this.modalController.dismiss(); 
+        //this.modalController.dismiss();
       };
-      
+
     });
   }
   async openChatOptions(ev: any) {
@@ -271,7 +287,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   }
   async addContacts(){
     console.log(this.members);
-  
+
     const modal = await this.modalController.create({
       component: GroupContactsPage,
       componentProps: {
@@ -279,7 +295,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
         room: this.room,
         members: this.members,
         name: this.room.name,
-      }, 
+      },
       cssClass: 'contacts',
       backdropDismiss: false
     });
@@ -310,7 +326,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
         handler: () => {
           console.log('Play clicked');
         }
-      }, 
+      },
       ]
     });
     await actionSheet.present();
@@ -354,5 +370,37 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     return await modal.present();
   }
 
+  async serverLongPull(){
+    this.chatService.getPrivateGroupMessages(this.roomId).subscribe(async res => {
+
+    if (res == 502) {
+      // Connection timeout
+      // happens when the connection was pending for too long
+      // let's reconnect
+      await this.serverLongPull();
+    } else if (res != 200) {
+      // Show Error
+      //showMessage(response.statusText);
+      //this.loadMessages()
+      this.messages = res['messages'].filter(data => data.t != 'au');
+      console.log(this.messages);
+      // Reconnect in one second
+      if(this.route.url != "/home/chat"){
+        console.log("Timer message stop")
+      } else {
+         await new Promise(resolve => setTimeout(resolve, 1000));
+        await this.serverLongPull();
+        console.log('Timer message running')
+      }
+
+    } else {
+      // Got message
+      //let message = await response.text();
+      //this.loadMessages()
+      await this.serverLongPull();
+    }
+  });
+  }
+
 }
 
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index 68df0176b..b3192cc50 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -30,11 +30,9 @@ export class ContactsPage implements OnInit {
     private http: HttpClient,
     private chatService: ChatService,
     private authService: AuthService,
-  ) 
-  {  
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-    });
+  )
+  {
+    this.loggedUser = authService.ValidatedUserChat['data'];
     this.textSearch="";
     this.dm=null;
     this.room=null;
@@ -65,7 +63,7 @@ export class ContactsPage implements OnInit {
   }
 
   loadUsers(){
-    this.options = { 
+    this.options = {
       headers: this.headers,
     };
     this.chatService.getAllUsers().subscribe((res:any)=>{
@@ -105,7 +103,7 @@ export class ContactsPage implements OnInit {
   close(){
     this.modalController.dismiss();
   }
-  
+
   clicked(){
     console.log('clicked');
   }
@@ -122,7 +120,7 @@ export class ContactsPage implements OnInit {
   }
   getDirectMessage(roomId:any){
     console.log(roomId);
-    
+
     this.chatService.getAllDirectMessages().subscribe(res=>{
       let result = res['ims'].filter(data => data._id == roomId);
       this.dm = result[0];
@@ -133,7 +131,7 @@ export class ContactsPage implements OnInit {
   async openModal(dm:any){
     this.close();
     console.log(dm);
-    
+
     const modal = await this.modalController.create({
       component: MessagesPage,
       cssClass: 'group-messages',
@@ -155,8 +153,8 @@ export class ContactsPage implements OnInit {
     //Get direct messages (dm)
     /* this.getDirectMessage(this.room._id); */
     console.log(this.dm);
-    
-      
+
+
     /* const modal = await this.modalController.create({
       component: MessagesPage,
       cssClass: 'group-messages',
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index a570a2633..0e4ce007b 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -10,7 +10,7 @@
           <button class="btn-no-color" (click)="_openMessagesOptions()">
             <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </button>
-        </div>  
+        </div>
       </div>
       <div hidden class="header-bottom" (click)="addContacts()">
         <div class="header-bottom-icon">
@@ -56,8 +56,8 @@
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
-        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
-        <button class="btn-no-color" (click)="notImplemented()">
+        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
+        <button hidden class="btn-no-color" (click)="notImplemented()">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>
       </ion-item>
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index 547b63b8f..eee2a3788 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -13,7 +13,7 @@
         color:#000;
         transform: translate3d(0, 1px, 0);
         padding: 30px 20px 0 20px !important;
-        
+
         .header-top{
           width: 100%;
           overflow: auto;
@@ -26,7 +26,7 @@
             margin: 2px 0 0 5px;
             display: flex;
             align-items: center;
-            
+
           }
           .right{
             padding: 0!important;
@@ -39,7 +39,7 @@
         .header-bottom{
           width: 95%;
           overflow: auto;
-         
+
 
           .header-bottom-icon{
             width: 30px;
@@ -60,7 +60,7 @@
             margin: 1px;
           }
         }
-    
+
         .title{
           font-size: 25px;
           overflow: auto;
@@ -76,7 +76,7 @@
         .div-icon ion-icon{
           float: right;
           padding-left: 20px;
-        } 
+        }
     }
  }
  ion-content{
@@ -96,6 +96,7 @@
      line-height: 1.2rem;
      //margin: 20px 39px 25px;
      border-radius: 8px;
+     border: 1px solid red;
    }
 
    .messages{
@@ -118,7 +119,7 @@
       width: 100%;
       overflow: auto;
     }
-    
+
 
     .incoming-true, .incoming-false{
        padding: 15px 20px;
@@ -157,9 +158,9 @@
   .container{
     justify-content: center;
     justify-content: space-evenly;
-    
+
   }
-  
+
   .chat-icon-options{
     display:block !important;
     font-size: 25px;
@@ -186,7 +187,7 @@
       align-self: center;
     }
   }
-  
+
  }
 
  .text-color-blue{
@@ -231,5 +232,4 @@ display: block;
  float: left;
  padding-left: 10px;
 }
- 
- 
\ No newline at end of file
+
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 780760ef4..3111da46c 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -9,6 +9,7 @@ import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popo
 import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
 import { ProfileComponent } from '../../headers/header-no-search/profile/profile.page';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-messages',
@@ -27,9 +28,11 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   dm:any;
   userPresence='';
   dmUsers:any;
+  checktimeOut: boolean;
 
   @Input() roomId:string;
-  
+  @Input() showMessages:string;
+
   constructor(
     public popoverController: PopoverController,
     private modalController: ModalController,
@@ -39,13 +42,15 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     private animationController: AnimationController,
     private alertService: AlertService,
     private toastService: ToastService,
-  ) { 
+    private route: Router
+  ) {
+    this.loggedUser = authService.ValidatedUserChat['data'];
+
    /*  this.dm = this.navParams.get('dm'); */
   }
   ngOnChanges(changes: SimpleChanges): void {
-    console.log(this.roomId);
     this.load();
-    
+
     //throw new Error('Method not implemented.');
   }
 
@@ -53,25 +58,30 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
 
     this.scrollToBottom();
 
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-      console.log(this.loggedUser); 
-    });
-    
     /* setInterval(()=>{ */
       this.load();
     /* }, 9000); */
     console.log(this.roomId);
-    
-    
+    console.log("Chat route", this.route.url)
+
+
+
   }
-  
+
+  ngOnDestroy(){
+    this.checktimeOut = false;
+    console.log('On Destroy')
+
+
+  }
+
   notImplemented(){
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
   load(){
-    this.loadMessages();
+    this.checktimeOut = true;
+    this.serverLongPull();
     this.getChatMembers();
   }
 
@@ -80,54 +90,51 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     this.load();
     ev.target.complete();
   }
-  
-  ngAfterViewChecked() {        
-    this.scrollToBottom();
-    console.log(this.roomId);
-  } 
-  scrollToBottom(): void {
-    const loader = this.toastService.loading()
 
+  ngAfterViewChecked() {
+    //this.scrollToBottom();
+  }
+
+  scrollToBottom(): void {
     try {
       this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
-    } catch(err) { }         
+    } catch(err) { }
     finally {
-      loader.remove()
     }
-            
-  }
-  loadMoreMessages(ev:any){
-
   }
 
   sendMessage(){
 
     let body = {
-      "message": 
-      { 
-        "rid": this.roomId, "msg": this.message 
+      "message":
+      {
+        "rid": this.roomId, "msg": this.message
       }
     }
-    
+
     this.chatService.sendMessage(body).subscribe(res=> {
-      this.loadMessages(); 
     });
     this.message = "";
   }
-  
+
   loadMessages(){
-    this.showLoader = true;
+    //this.showLoader = true;
     this.chatService.getRoomMessages(this.roomId).subscribe(res => {
-      /* console.log(res); */
+      console.log(res);
       this.messages = res['messages'].reverse();
       console.log(this.messages);
-      this.showLoader = false;
+      //this.serverLongPull(res)
+      /* this.chatService.subscribe(this.roomId).then(res => {
+        console.log("Real fake msg", res)
+      }); */
+      //this.showLoader = false;
     })
   }
+
   getChatMembers(){
     console.log(this.roomId);
-    
-    this.showLoader = true;
+
+    //this.showLoader = true;
     this.chatService.getMembers(this.roomId).subscribe(res=> {
       this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
       console.log(res);
@@ -152,7 +159,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   async addContacts(){
     const modal = await this.modalController.create({
       component: ContactsPage,
-      componentProps: {}, 
+      componentProps: {},
       cssClass: 'contacts',
       backdropDismiss: false
     });
@@ -209,7 +216,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     const leaveAnimation = (baseEl: any) => {
       return enterAnimation(baseEl).direction('reverse');
     }
- 
+
 
     /* const popover = await this.popoverController.create({
       component: MessagesOptionsPage,
@@ -234,7 +241,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     return await modal.present();
   }
 
-  
+
 
   async _openChatOptions() {
 
@@ -260,7 +267,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     const leaveAnimation = (baseEl: any) => {
       return enterAnimation(baseEl).direction('reverse');
     }
- 
+
 
     /* const popover = await this.popoverController.create({
       component: MessagesOptionsPage,
@@ -285,6 +292,37 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     return await modal.present();
   }
 
+  async serverLongPull(){
+    this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
+
+    if (res == 502) {
+      // Connection timeout
+      // happens when the connection was pending for too long
+      // let's reconnect
+      await this.serverLongPull();
+    } else if (res != 200) {
+      // Show Error
+      //showMessage(response.statusText);
+      //this.loadMessages()
+      this.messages = res['messages'].reverse();
+      console.log(this.messages);
+      // Reconnect in one second
+      if(this.route.url != "/home/chat"){
+        console.log("Timer message stop")
+      } else {
+         await new Promise(resolve => setTimeout(resolve, 1000));
+        await this.serverLongPull();
+        console.log('Timer message running')
+      }
+
+    } else {
+      // Got message
+      //let message = await response.text();
+      //this.loadMessages()
+      await this.serverLongPull();
+    }
+  });
+  }
 
 }
 
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 1ca172910..798f86192 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -52,12 +52,12 @@ export class PedidosPage implements OnInit {
     }
 
   ngOnInit() {
-    
+
     this.LoadList();
 
     this.router.events.forEach((event) => {
-      if(event instanceof NavigationStart && '/home/gabinete-digital?parecer=true'.startsWith(event.url) || 
-        event instanceof NavigationStart && '/home/gabinete-digital?deferimento=true'.startsWith(event.url) || 
+      if(event instanceof NavigationStart && '/home/gabinete-digital?parecer=true'.startsWith(event.url) ||
+        event instanceof NavigationStart && '/home/gabinete-digital?deferimento=true'.startsWith(event.url) ||
         event instanceof NavigationStart && '/home/gabinete-digital?pedidos=true'.startsWith(event.url)
       )  {
 
@@ -70,7 +70,7 @@ export class PedidosPage implements OnInit {
       }
     });
 
-    
+
   }
 
   segmentChanged(ev: any) {
@@ -88,7 +88,7 @@ export class PedidosPage implements OnInit {
 
   async LoadList() {
 
-    this.skeletonLoader = true
+    this.skeletonLoader = true;
 
     if(this.segment == 'parecer') {
       this.taskType = "Pedido de Parecer";
@@ -132,7 +132,7 @@ export class PedidosPage implements OnInit {
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
 
         this.taskslist = result.filter(data => data.workflowInstanceDataFields.Status == "Active")
-        
+
         this.skeletonLoader = false
 
         this.deferimentoList = new Array();
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 8fd9e56fe..b9f2a1250 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -48,11 +48,10 @@
           <span>Acções</span>
         </div>
 
-
-        <!-- <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
           <ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
           <span>Chat</span>
-        </div> -->
+        </div>
 
       </div>
 
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html
index 05601e0d0..95a960395 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.html
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.html
@@ -44,10 +44,10 @@
         </div>
 
 
-        <!-- <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
+        <div class="tab mr-20  d-flex align-center cursor-pointer" (click)="changeRoute('/home/chat')" [class.active]="locationPathname() == '/home/chat'">
           <ion-icon class="font-40" src='assets/images/icons-nav-grupos-inactive-dk-white.svg'></ion-icon>
           <span>Chat</span>
-        </div> -->
+        </div>
 
       </div>
 
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index c5b42386b..22a9e4e0c 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -287,7 +287,7 @@ $app-theme: mat-light-theme((
   padding: 25px;
 } */
 //MODALS
-.emend-message-modal{
+.add-note-modal, .emend-message-modal{
   --height: 50%;
   --border-radius: 10px;
   padding: 25px;
@@ -297,7 +297,7 @@ $app-theme: mat-light-theme((
   --height: 50%;
   --border-radius: 10px;
   padding: 25px;
-  background: rgba(51, 51, 51, 0.3); 
+  background: rgba(51, 51, 51, 0.3);
 }
 .modal, .newchat, .new-group, .contacts, .group-messages, .custom-modal{
   padding-top: 65px;
@@ -315,7 +315,7 @@ $app-theme: mat-light-theme((
   right: 0 !important;
   top: calc(100% - 160px) !important;
   max-height: 160px;
-  min-height: 160px; 
+  min-height: 160px;
 }
 .messages-options .popover-content{
   width: 100% !important;