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 0a5ae759c..e69de29bb 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -1,343 +0,0 @@
-<ion-header class="ion-no-border">
-  <ion-toolbar class="header-toolbar">
-    <div class="main-header" *ngIf="ChatSystemService.getGroupRoom(roomId)">
-      <div class="header-top">
-        <!-- <app-btn-modal-dismiss></app-btn-modal-dismiss> -->
-        <div class="left">
-          <button class="btn-no-color" (click)="close()">
-            <!-- <ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon> -->
-            <fa-icon icon="chevron-left" class="header-top-btn font-awesome-1"></fa-icon>
-          </button>
-        </div>
-        <div class="middle-container" *ngIf="!showMessageOptions">
-          <div class="middle add-ellipsis">
-            <ion-label class="title">{{ ChatSystemService.getGroupRoom(roomId).name.split('-').join(' ') }}</ion-label>
-          </div>
-        </div>
-        <div class="middle-container-options" *ngIf="showMessageOptions">
-          <fa-icon (click)="deleteMessage(selectedMsgId)" icon="trash" class="middle-container-options-icons"></fa-icon>
-        </div>
-        <div class="right">
-          <button class="btn-no-color" (click)="openOptions()">
-            <!--  <ion-icon src="assets/images/icons-menu.svg"></ion-icon> -->
-            <fa-icon icon="ellipsis-v" class="header-top-btn font-awesome-1"></fa-icon>
-          </button>
-        </div>
-      </div>
-      <div (click)="addContacts()" class="header-bottom">
-        <div class="header-bottom-icon">
-          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
-          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
-        </div>
-        <div class="header-bottom-contacts" *ngIf="ChatSystemService.getGroupRoom(roomId)">
-          <ion-label class="contacts-list"
-            *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe; let last = last">
-            {{member.name}}<span *ngIf="!last">, </span>
-          </ion-label>
-        </div>
-      </div>
-      <div *ngIf="roomCountDownDate" class="d-flex align-items-center yellow-orange pl-10">
-        <i class="far fa-clock font-15"></i>
-        <ion-label class="font-15 pl-10" color="warning">{{ChatSystemService.getGroupRoom(roomId).countDownTime}}</ion-label>
-      </div>
-    </div>
-  </ion-toolbar>
-</ion-header>
-
-
-<ion-content *ngIf="ChatSystemService.getGroupRoom(roomId)">
-
-  <div (click)="handleClick()" 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="messages-list-item-wrapper container-width-100"
-      *ngFor="let msg of ChatSystemService.getGroupRoom(roomId).messages; let last = last"
-      [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
-      <div class='message-container incoming-{{msg.u.username!=sessionStore.user.UserName}}'
-        *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.msg !=''"
-        (press)="handlePress(msg._id)" [class.dateLabel]="msg.dateLabel">
-        <div class="title" *ngIf="!msg.dateLabel">
-          <ion-label>{{msg.u.name ?? ""}}</ion-label>
-          <span class="time">{{msg.time}}</span>
-        </div>
-        <div class="message">
-          <pre *ngIf="msg.delate == false" class="message-box text ma-0 font-13-rem"
-            style="font-size: 0.8125rem !important;">{{msg.msg}}</pre>
-          <pre *ngIf="msg.delate == true" class="message-box text ma-0 font-13-rem"
-            style="font-size: 0.8125rem !important;">{{msg.msg}}</pre>
-
-
-          <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-            <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10">
-              Enviado</span>
-            <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
-            <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> -->
-            <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
-            <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-            <span class="lido pl-10" *ngIf="msg.viewed.length >= 1"> Lido</span>
-            <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
-          </ion-label>
-          {{last ? scrollToBottom() : ''}}
-        </div>
-      </div>
-
-
-      <div *ngIf="msg.file && msg.delate == false">
-        <div class='message-container incoming-{{msg.u.username!=sessionStore.user.UserName}}'
-          class='message-container incoming-{{msg.u.username!=sessionStore.user.UserName}}'
-          *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru' && msg.file.type != 'application/meeting'"
-          (press)="handlePress(msg._id)">
-          <div class="title">
-            <ion-label>{{msg.u.name ?? ""}}</ion-label>
-            <span class="time">{{msg.time}}</span>
-          </div>
-          <div class="message">
-            <div *ngIf="msg.attachments" class="message-attachments">
-              <div *ngFor="let file of msg.attachments">
-                <div *ngIf="msg.file.type == 'application/img' && !msg.attachments[0].image_url">
-                  NOT UPLOADED
-                </div>
-                <div *ngIf="msg.file.type == 'application/img' && msg.attachments[0].image_url"
-                  (click)="openPreview(msg)">
-                  <div *ngIf="!msg.attachments[0].image_url">
-                    <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
-                      <ion-icon name="image" class="file-icon"></ion-icon>
-                      <ion-label>{{"Imagem"}}</ion-label>
-                      <ion-icon
-                        *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.uploadingFile == false && msg.downloadAttachmentsTemp == 0"
-                        class="icon-download" src="assets/icon/theme/{{ThemeService.currentTheme}}/icons-download.svg"
-                        slot="end"></ion-icon>
-                      <ion-icon *ngIf="msg.downloadLoader == true || msg.uploadingFile == true " class="icon-download"
-                        src="assets/gif/theme/{{ThemeService.currentTheme}}/Blocks-loader.svg" slot="end"></ion-icon>
-                      <ion-icon
-                        *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false"
-                        src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12"> </ion-icon>
-                    </ion-item>
-                  </div>
-                  <img class="d-block width-100" *ngIf="msg.attachments[0].image_url"
-                    src="{{msg.attachments[0].image_url}}" alt="image">
-                  <ion-icon *ngIf="msg.attachments[0].image_url == null" name="download-outline"></ion-icon>
-                  <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-                    <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10">
-                      Enviado</span>
-                    <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
-                    <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> -->
-                    <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
-                    <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                    <span class="lido pl-10" *ngIf="msg.viewed.length >= 1"> Lido</span>
-                    <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()">Tentar</div>
-                  </ion-label>
-                </div>
-                <div *ngIf="msg.file.type != 'application/img'">
-                  <div class="file add-attachment-bg-color" *ngIf="msg.file.type != 'application/audio'">
-                    <div (click)="openPreview(msg)" class="file-details add-ellipsis cursor-pointer" *ngIf="msg.file">
-                      <div *ngIf="!msg.attachments[0].image_url">
-                        <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
-
-                          <ion-icon *ngIf="msg.attachments[0].type != 'webtrix'" name="document"
-                            class="file-icon"></ion-icon>
-                          <ion-icon *ngIf="msg.attachments[0].type == 'webtrix'" src="assets/icon/webtrix.svg"
-                            class="file-icon"></ion-icon>
-                          <ion-label>{{ file.title}}</ion-label>
-                          <ion-icon
-                            *ngIf="ThemeService.currentTheme == 'default' && msg.attachments[0].type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) "
-                            class="icon-download" src="assets/icon/theme/default/icons-download.svg"
-                            slot="end"></ion-icon>
-                          <ion-icon
-                            *ngIf="ThemeService.currentTheme == 'gov' && msg.attachments[0].type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) "
-                            class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
-                          <ion-icon *ngIf="( msg.downloadLoader == true || msg.uploadingFile == true )"
-                            class="icon-download" src="assets/gif/theme/{{ThemeService.currentTheme}}/Blocks-loader.svg"
-                            slot="end"></ion-icon>
-
-
-                        </ion-item>
-                      </div>
-                      <div *ngIf="msg.attachments[0].image_url">
-                        <span *ngIf="msg.file.type">
-                          <fa-icon *ngIf="msg.file.type == 'application/pdf'" icon="file-pdf"
-                            class="pdf-icon"></fa-icon>
-                          <fa-icon *ngIf="msg.file.type == 'application/word'" icon="file-word"
-                            class="word-icon"></fa-icon>
-                          <fa-icon
-                            *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'"
-                            icon="file-word" class="word-icon"></fa-icon>
-                          <fa-icon
-                            *ngIf="msg.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'"
-                            icon="file-word" class="excel-icon"></fa-icon>
-                          <ion-icon *ngIf="msg.file.type == 'application/webtrix'"
-                            src="assets/icon/webtrix.svg"></ion-icon>
-                        </span>
-                        <ion-label class="file-title">{{file.title}}</ion-label>
-                      </div>
-                    </div>
-                  </div>
-                  <div (click)="audioPreview(msg)" class="audio-contentainer"
-                    *ngIf="msg.file.type == 'application/audio' && !file.title_link">
-                    <ion-item class="add-attachment-bg-color" shape="round" lines="none" type="button">
-                      <ion-icon name="mic-outline" class="file-icon"></ion-icon>
-                      <ion-label>{{"Mensagem de voz"}}</ion-label>
-                      <ion-icon
-                        *ngIf="ThemeService.currentTheme == 'gov' && msg.downloadLoader == false && msg.uploadingFile == false && msg.downloadAttachmentsTemp == 0"
-                        class="icon-download" src="assets/icon/theme/{{ThemeService.currentTheme}}/icons-download.svg"
-                        slot="end"></ion-icon>
-                      <ion-icon *ngIf="( msg.downloadLoader == true || msg.uploadingFile == true )"
-                        class="icon-download" src="assets/gif/theme/{{ThemeService.currentTheme}}/Blocks-loader.svg"
-                        slot="end"></ion-icon>
-                      <ion-icon
-                        *ngIf="msg.downloadAttachments == false && msg.downloadAttachmentsTemp >= 1 && msg.downloadLoader == false"
-                        src="assets/images/retry-svgrepo-com.svg" class="icon-download font-12"> </ion-icon>
-                    </ion-item>
-                  </div>
-                  <div class="audio-contentainer" *ngIf="msg.file.type == 'application/audio' && file.title_link">
-                    <audio [src]="file.title_link|safehtml" preload="metadata" class="d-flex width-100" controls
-                      controlsList="nodownload noplaybackrate"></audio>
-                  </div>
-                  <div class="file-details-optional add-attachment-bg-color">
-                    <ion-label *ngIf="msg.file && msg.file != ''">
-                      <span *ngIf="file.description">{{file.description}}</span>
-                      <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
-
-                    </ion-label>
-                    <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-
-                      <span *ngIf="msg.online == true && !msg.manualRetry && msg.viewed == 0" class="enviado pl-10">
-                        Enviado</span>
-                      <!-- <ion-icon *ngIf="msg.messageSend == false && !msg.manualRetry" src="assets/images/clock-regular.svg"></ion-icon> -->
-                      <!-- <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0 && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon> -->
-                      <!-- <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon> -->
-                      <!-- <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon> -->
-                      <span class="lido pl-10" *ngIf="msg.viewed.length >= 1"> Lido</span>
-                      <div *ngIf="msg.manualRetry" class="try pl-10" (click)="msg.send()"> Tentar</div>
-                    </ion-label>
-                  </div>
-                </div>
-              </div>
-            </div>
-            {{last ? scrollToBottom() : ''}}
-          </div>
-        </div>
-        <div *ngIf="msg.file.type == 'application/meeting'" class="info-meeting">
-          <ion-label class="info-meeting-small">{{msg.u.name ?? ""}} criou esta reunião</ion-label><br />
-          <button (click)="goToEvent(msg.file)" class="btn-no-color info-meeting-normal"><ion-label
-              class="info-meeting-normal">{{msg.file.subject}}</ion-label></button><br />
-          <ion-label class="info-meeting-medium"><ion-icon name="calendar-outline"></ion-icon> De
-            {{showDateDuration(msg.file.start_date)}} a {{showDateDuration(msg.file.end_date)}}</ion-label><br />
-          <ion-label class="info-meeting-medium"><ion-icon></ion-icon><ion-icon name="location-outline"></ion-icon>
-            {{msg.file.venue}}</ion-label><br />
-        </div>
-      </div>
-
-      <div class="dateLabel" *ngIf="(msg.t == 'r' || msg.t == 'ul' || msg.t == 'au' || msg.t == 'ru') && msg.dateLabel">
-        {{ msg.msg}}
-      </div>
-
-      <div *ngIf="msg.file && msg.delate == true">
-        Apagou a mensagem
-      </div>
-
-      <div *ngIf="msg.t == 'r'" class="info-text">
-        <ion-label>Alterou o nome do grupo para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
-        {{last ? scrollToBottom() : ''}}
-      </div>
-      <div *ngIf="msg.t == 'ul'" class="info-text-leave">
-        <div *ngFor="let user of ChatSystemService.users">
-          <div *ngIf="msg.msg == user.username">
-            <ion-label>{{user.name}} saiu do grupo</ion-label><br />
-          </div>
-        </div>
-        {{last ? scrollToBottom() : ''}}
-      </div>
-      <div *ngIf="msg.t == 'ru'" class="info-text-leave">
-        <div *ngFor="let user of ChatSystemService.users">
-          <div *ngIf="msg.msg == user.username">
-            <ion-label>{{user.name}} foi removido do grupo</ion-label><br />
-          </div>
-        </div>
-        {{last ? scrollToBottom() : ''}}
-      </div>
-      <div *ngIf="msg.t == 'au' &&  msg.msg != sessionStore.user.UserName">
-
-        <div *ngFor="let user of ChatSystemService.users">
-          <div *ngIf="msg.msg == user.username" class="info-text-leave">
-            <ion-label>Adicionou {{user.name}}</ion-label><br />
-          </div>
-        </div>
-        {{last ? scrollToBottom() : ''}}
-      </div>
-    </div>
-  </div>
-  <ion-fab horizontal="end" vertical="bottom" slot="fixed">
-    <ion-fab-button *ngIf="scrollToBottomBtn" (click)="scrollToBottomClicked()" color="light" size="small">
-      <ion-icon name="chevron-down"></ion-icon>
-    </ion-fab-button>
-  </ion-fab>
-
-</ion-content>
-
-<ion-footer *ngIf="ChatSystemService.getGroupRoom(roomId)">
-
-  <div class="typing" *ngIf="ChatSystemService.getGroupRoom(roomId).otherUserType == true">
-    <ngx-letters-avatar *ngIf="showAvatar" [avatarName]="ChatSystemService.getGroupRoom(roomId).name" [width]="30"
-      [circular]="true" fontFamily="Roboto"></ngx-letters-avatar>
-    {{ ChatSystemService.getGroupRoom(roomId).userThatIsTyping }} está a escrever...
-  </div>
-
-  <div class="width-100 pl-20 pr-20">
-    <span *ngIf="!lastAudioRecorded">{{durationDisplay}}</span>
-    <audio [src]="audioRecorded" class="d-flex width-100 mt-10 mb-10" *ngIf="lastAudioRecorded" controls
-      controlsList="nodownload noplaybackrate"></audio>
-  </div>
-
-  <div class="container width-100 d-flex">
-    <div>
-      <button *ngIf="!recording && !lastAudioRecorded && allowTyping" class="btn-no-color" (click)="openChatOptions()">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options"
-          src="assets/images/icons-add.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options"
-          src="assets/images/theme/gov/icons-add.svg"></ion-icon>
-      </button>
-      <button *ngIf="recording || lastAudioRecorded || !allowTyping" class="btn-no-color" (click)="deleteRecording()">
-        <fa-icon class="icon-size-27" icon="trash"></fa-icon>
-      </button>
-    </div>
-    <div class="message-box width-80">
-      <div *ngIf="!recording && !lastAudioRecorded" class="type-message">
-        <ion-textarea *ngIf="allowTyping" autocomplete="on" autocorrect="on" spellcheck="true" clearOnEdit="true"
-          placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1"
-          [(ngModel)]="ChatSystemService.getGroupRoom(roomId).message"
-          (ionChange)="ChatSystemService.getGroupRoom(roomId).sendTyping()"></ion-textarea>
-      </div>
-      <div *ngIf="recording" class="d-flex align-items-center justify-content-center">
-        <button (click)="stopRecording()" class="btn-no-color d-flex align-items-center justify-content-center">
-          <ion-icon class="icon-size-45" name="stop-circle-outline" color="danger"></ion-icon>
-        </button>
-      </div>
-    </div>
-    <div>
-      <button #recordbtn *ngIf="!ChatSystemService.getGroupRoom(roomId).message && !lastAudioRecorded"
-        (click)="startRecording()" class="btn-no-color">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
-          src="assets/icon/theme/default/icons-chat-record-audio.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-record-audio.svg"></ion-icon>
-      </button>
-      <button *ngIf="ChatSystemService.getGroupRoom(roomId).message" class="btn-no-color" (click)="sendMessage()">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
-          src="assets/icon/icons-chat-send.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
-      </button>
-      <button *ngIf="!ChatSystemService.getGroupRoom(roomId).message && lastAudioRecorded" class="btn-no-color"
-        (click)="sendAudio(lastAudioRecorded)">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
-      </button>
-    </div>
-  </div>
-
-</ion-footer>
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 a42e49399..bd8dcb336 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -197,19 +197,19 @@
         {{last ? scrollToBottom() : ''}}
       </div>
       <div *ngIf="msg.t == 'ul'" class="info-text-leave">
-        <div *ngFor="let user of allUsers">
+        <!-- <div *ngFor="let user of allUsers">
           <div *ngIf="msg.msg == user.username">
             <ion-label>{{user.name}} saiu do grupo</ion-label><br />
           </div>
-        </div>
+        </div> -->
         {{last ? scrollToBottom() : ''}}
       </div>
       <div *ngIf="msg.t == 'ru'" class="info-text-leave">
-        <div *ngFor="let user of allUsers">
+        <!-- <div *ngFor="let user of allUsers">
           <div *ngIf="msg.msg == user.username">
             <ion-label>{{user.name}} foi removido do grupo</ion-label><br />
           </div>
-        </div>
+        </div> -->
         {{last ? scrollToBottom() : ''}}
       </div>
       <div *ngIf="msg.t == 'au' && msg.msg != sessionStore.user.UserName">