diff --git a/migrations/2025-07-21-014019_message_is_edited/down.sql b/migrations/2025-07-21-014019_message_is_edited/down.sql
new file mode 100644
index 0000000..1a636b9
--- /dev/null
+++ b/migrations/2025-07-21-014019_message_is_edited/down.sql
@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE messages DROP COLUMN is_edited;
diff --git a/migrations/2025-07-21-014019_message_is_edited/up.sql b/migrations/2025-07-21-014019_message_is_edited/up.sql
new file mode 100644
index 0000000..e600a55
--- /dev/null
+++ b/migrations/2025-07-21-014019_message_is_edited/up.sql
@@ -0,0 +1,2 @@
+-- Your SQL goes here
+ALTER TABLE messages ADD COLUMN is_edited BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/src/objects/channel.rs b/src/objects/channel.rs
index cacb153..ad16379 100644
--- a/src/objects/channel.rs
+++ b/src/objects/channel.rs
@@ -285,6 +285,7 @@ impl Channel {
             user_uuid,
             message,
             reply_to,
+            is_edited: false,
         };
 
         let mut conn = app_state.pool.get().await?;
@@ -297,6 +298,22 @@ impl Channel {
         message.build(app_state).await
     }
 
+    pub async fn edit_message(&self, app_state: &AppState, user_uuid: Uuid, message_uuid: Uuid, message: String) -> Result<Message, Error> {
+        use messages::dsl;
+
+        let mut conn = app_state.pool.get().await?;
+
+        let message: MessageBuilder = update(messages::table)
+            .filter(dsl::user_uuid.eq(user_uuid))
+            .filter(dsl::uuid.eq(message_uuid))
+            .set((dsl::is_edited.eq(true), dsl::message.eq(message)))
+            .returning(MessageBuilder::as_select())
+            .get_result(&mut conn)
+            .await?;
+
+        message.build(app_state).await
+    }
+
     pub async fn set_name(&mut self, app_state: &AppState, new_name: String) -> Result<(), Error> {
         if !CHANNEL_REGEX.is_match(&new_name) {
             return Err(Error::BadRequest("Channel name is invalid".to_string()));
diff --git a/src/objects/message.rs b/src/objects/message.rs
index caff969..c50f82c 100644
--- a/src/objects/message.rs
+++ b/src/objects/message.rs
@@ -15,6 +15,7 @@ pub struct MessageBuilder {
     pub user_uuid: Uuid,
     pub message: String,
     pub reply_to: Option<Uuid>,
+    pub is_edited: bool,
 }
 
 impl MessageBuilder {
@@ -27,6 +28,7 @@ impl MessageBuilder {
             user_uuid: self.user_uuid,
             message: self.message.clone(),
             reply_to: self.reply_to,
+            is_edited: self.is_edited,
             user,
         })
     }
@@ -39,5 +41,6 @@ pub struct Message {
     user_uuid: Uuid,
     message: String,
     reply_to: Option<Uuid>,
+    is_edited: bool,
     user: User,
 }
diff --git a/src/schema.rs b/src/schema.rs
index 4095dcd..b3cb3d4 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -94,6 +94,7 @@ diesel::table! {
         #[max_length = 4000]
         message -> Varchar,
         reply_to -> Nullable<Uuid>,
+        is_edited -> Bool,
     }
 }