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 245e9b100..3d5467fde 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -209,14 +209,14 @@ ion-content {
     }
 
     .incoming-true {
-      margin: 10px 75px 10px 20px;
+      margin: 10px 35px 10px 20px;
       background: #ebebeb;
       float: left;
     }
   }
 
   .incoming-false {
-    margin: 10px 20px 10px 75px;
+    margin: 10px 20px 10px 35px;
     background: var(--chat-incoming-msg-color);
     float: right;
   }
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss
index a25a0e441..a689a8f67 100644
--- a/src/app/pages/chat/messages/messages.page.scss
+++ b/src/app/pages/chat/messages/messages.page.scss
@@ -191,14 +191,14 @@ ion-content {
     }
 
     .incoming-true {
-      margin: 10px 75px 10px 20px;
+      margin: 10px 35px 10px 20px;
       background: #ebebeb;
       float: left;
     }
   }
 
   .incoming-false {
-    margin: 10px 20px 10px 75px;
+    margin: 10px 20px 10px 35px;
     background: var(--chat-incoming-msg-color);
     float: right;
   }
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 98142366d..34fc87daa 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -374,6 +374,10 @@ export class EventsPage implements OnInit {
 
     this.firstEnter = true
 
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
+
     
   }
 
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 6af101ec0..1dda9c0d1 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -66,6 +66,10 @@ export class AuthService {
           if(!data?.user?.Authorization && SessionStore?.user?.Authorization) {
             window.location.reload();
           }
+
+          if(window['all-process-gabinete']) {
+            window['all-process-gabinete']()
+          }
         }
       });
     
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 448e4f613..be26daf56 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -360,8 +360,6 @@ export class RoomService {
       
     }
 
-    console.log('ChatMessage', ChatMessage)
-
     if(ChatMessage?.t == "au" || ChatMessage?.t == "ru" || ChatMessage?.t == "ul") {
       this.updateContacts()
     } else if (ChatMessage?.t == "r") {
@@ -744,6 +742,11 @@ export class RoomService {
           this.sendDeleteRequest(wewMessage._id)
         }
       }
+
+      if(!this.lastMessage) {
+        this.lastMessage = messages.pop();  
+      }
+      
       
       setTimeout(() => {
         this.scrollDown()
@@ -800,6 +803,14 @@ export class RoomService {
   
     }
 
+    if(chatHistory?.result?.messages) {
+      
+      if(!this.lastMessage) {
+        this.lastMessage = chatHistory?.result?.messages.pop() as any
+      }
+    }
+
+
   }
 
   async readAllMessage() {
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index 61b1b1e76..30014b2cf 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -76,8 +76,10 @@ export class TaskService {
     this.updateCount()
     this.runCallback();
 
-    document.addEventListener('resume', function () {
-      // this.loadAllTask();
+    document.addEventListener('resume', () => {
+      if(window['all-process-gabinete']) {
+        window['all-process-gabinete']()
+      }
     });
    }
 
diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts
index 8fa3ae1c5..d8eb2e86f 100644
--- a/src/app/store/expedientegd-store.service.ts
+++ b/src/app/store/expedientegd-store.service.ts
@@ -76,7 +76,7 @@ export class ExpedientegdStoreService {
   }
 
   private save() {
-    setTimeout(()=>{ 
+    setTimeout(() => { 
       localstoreService.set(this.keyName,{
         list: this._list,
         count: this._count
diff --git a/version/git-version.ts b/version/git-version.ts
index abd8d0386..5198af0ad 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "d2f1aa194",
-  "SHA": "d2f1aa194924a7b7bfe26812b7c71bbf8c009108",
+  "shortSHA": "95d8bed53",
+  "SHA": "95d8bed53ddbc022ecb5e0ebb6c5f0b72ee919b6",
   "branch": "developer",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Aug 8 13:38:50 2023 +0100'",
+  "lastCommitTime": "'Tue Aug 8 13:43:24 2023 +0100'",
   "lastCommitMessage": "fix",
-  "lastCommitNumber": "5129",
+  "lastCommitNumber": "5140",
   "change": "",
-  "changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/modals/profile/profile.page.html\n\tmodified:   src/app/modals/profile/profile.page.scss\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/pages/login/login.page.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/tiny-mce/tiny-mce.page.html\n\tmodified:   src/app/tiny-mce/tiny-mce.page.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/chat/group-messages/group-messages.page.scss\n\tmodified:   src/app/pages/chat/messages/messages.page.scss\n\tmodified:   src/app/pages/events/events.page.ts\n\tmodified:   src/app/services/auth.service.ts\n\tmodified:   src/app/services/chat/room.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/store/expedientegd-store.service.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file