diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index 8f4ab1ea6..a6e2f52e5 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -570,7 +570,11 @@ export class RoomService {
     this.messagesLocalReference.push(localReference)
     const message: MessageService = await this.prepareCreate({message:offlineChatMessage, save: environment.chatOffline})
 
-    await message.addMessageDB()
+    if(this.hasLoadHistory == true) {
+      alert("save send")
+      await message.addMessageDB()
+    }
+    
     message.send()
     
 
@@ -757,11 +761,20 @@ export class RoomService {
       i++;
     }
 
-    this.hasLoadHistoryMessageRF = [];
-
-    reorderMessage.forEach((message) => {
+    for(let message of reorderMessage) { 
       this.messages.push(message)
-    });
+    }
+
+    for(let message of this.messages) {
+      if(this.hasLoadHistoryMessageRF.includes(message?.localReference)) {
+        if(!message.addToDb) {
+          message.addMessageDB()
+          
+        }
+      }
+    }
+
+    this.hasLoadHistoryMessageRF = [];
 
   }
 
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index a3065060b..bcae8f672 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -4,7 +4,7 @@
       <div class="header-top">
         <div class="middle">
           <ion-label class="title">{{ this.wsChatMethodsService.getDmRoom(this.roomId).name }}</ion-label>
-          <button>Dev</button>
+          <!-- <button (click)="ChatMessageDebuggingPage()">Dev</button> -->
           <!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
         </div>
         <div hidden class="right">
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index dc8717df1..f7a181c8b 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -34,6 +34,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { Howl } from 'howler';
 import { runInThisContext } from 'vm';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
+import { ChatMessageDebuggingPage } from 'src/app/shared/popover/chat-message-debugging/chat-message-debugging.page';
 
 
 const IMAGE_DIR = 'stored-images';
@@ -151,6 +152,18 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   }
 
+  async ChatMessageDebuggingPage() {
+    
+    const modal = await this.modalController.create({
+      component: ChatMessageDebuggingPage,
+      cssClass: 'model profile-modal search-submodal',
+      componentProps: {
+        roomId: this.roomId,
+      }
+    });
+    return await modal.present();
+  }
+
   async checkAudioPermission() {
     const permissionStatus = await navigator.permissions.query({ name: 'microphone' } as any)
 
@@ -1121,7 +1134,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   async getRoomInfo() {
-    this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
+    // this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
     let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
     // console.log('ROOM',room)
     this.room = room['room'];
diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.html b/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.html
index ad9259cfe..bca986256 100644
--- a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.html
+++ b/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.html
@@ -5,5 +5,6 @@
 </ion-header>
 
 <ion-content>
-
+  <button (click)="loadHistory()">Load History</button>
 </ion-content>
+
diff --git a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.ts b/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.ts
index e880e7c98..80d3f5767 100644
--- a/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.ts
+++ b/src/app/shared/popover/chat-message-debugging/chat-message-debugging.page.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { NavParams } from '@ionic/angular';
 import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.service';
 
 @Component({
@@ -8,11 +9,21 @@ import { WsChatMethodsService} from 'src/app/services/chat/ws-chat-methods.servi
 })
 export class ChatMessageDebuggingPage implements OnInit {
 
+  roomId: string
+
   constructor(
-    public wsChatMethodsService: WsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService,
+    private navParams: NavParams
   ) { }
 
   ngOnInit() {
+    this.roomId = this.navParams.get('roomId')
+    
+
+  }
+
+  loadHistory() {
+    this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({});
   }
 
 }