diff --git a/src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
index f4f0739..7efb4cd 100644
--- a/src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
+++ b/src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
@@ -173,8 +173,9 @@ public class MessageDatabase {
                         rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
                         rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
                         rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null,
-                        rs.getBoolean("is_deleted_globally")
-                ));
+                        rs.getBoolean("is_deleted_globally"),
+                        rs.getTimestamp("edited_at").toLocalDateTime()
+                        ));
             }
 
         } catch (SQLException e) {
@@ -275,8 +276,9 @@ public class MessageDatabase {
                 (UUID) rs.getObject("original_message_id"),
                 (UUID) rs.getObject("forwarded_by"),
                 (UUID) rs.getObject("forwarded_from"),
-                rs.getBoolean("is_deleted_globally")
-        );
+                rs.getBoolean("is_deleted_globally"),
+                rs.getTimestamp("edited_at").toLocalDateTime()
+                );
     }
 
 
@@ -483,7 +485,8 @@ public class MessageDatabase {
     }
 
     public static boolean insertSavedMessage(Message message) {
-        String sql = "INSERT INTO messages (message_id, sender_id, receiver_type, receiver_id, content, message_type, status) " +
+        String sql = "INSERT INTO messages (message_id, sender_id, receiver_type, receiver_id, content, message_type, status, reply_to_id, is_edited, original_message_id," +
+                " forwarded_by, forwarded_from, is_deleted_globally) " +
                 "VALUES (?, ?, ?, ?, ?, ?, ?)";
 
         try (Connection conn = ConnectionDb.connect();
diff --git a/src/main/java/org/to/telegramfinalproject/Models/Message.java b/src/main/java/org/to/telegramfinalproject/Models/Message.java
index 8dd8cb2..ed8f3d4 100644
--- a/src/main/java/org/to/telegramfinalproject/Models/Message.java
+++ b/src/main/java/org/to/telegramfinalproject/Models/Message.java
@@ -20,11 +20,12 @@ public class Message {
     private UUID forwarded_from;
     private List<FileAttachment> attachments;
     private boolean is_deleted_globally;
+    private LocalDateTime edited_at;
 
     public Message(UUID message_id, UUID sender_id, String receiver_type, UUID receiver_id, String content,
                    String message_type, LocalDateTime send_at, String status,
                    UUID reply_to_id, boolean is_edited, UUID original_message_id,
-                   UUID forwarded_by, UUID forwarded_from,boolean is_deleted_globally) {
+                   UUID forwarded_by, UUID forwarded_from,boolean is_deleted_globally, LocalDateTime edited_at) {
         this.message_id = message_id;
         this.sender_id = sender_id;
         this.receiver_type = receiver_type;
@@ -39,6 +40,7 @@ public class Message {
         this.forwarded_by = forwarded_by;
         this.forwarded_from = forwarded_from;
         this.is_deleted_globally = is_deleted_globally;
+        this.edited_at = edited_at;
     }
 
     public Message(UUID messageId, UUID senderId, UUID receiverId, String receiverType, String content, String messageType, LocalDateTime now) {
@@ -166,4 +168,12 @@ public class Message {
     public boolean getIs_deleted_globally() {
         return is_deleted_globally;
     }
+
+    public void setEdited_at(LocalDateTime edited_at) {
+        this.edited_at = edited_at;
+    }
+
+    public LocalDateTime getEdited_at() {
+        return edited_at;
+    }
 }