diff --git a/data/folder-by-parent.json b/data/folder-by-parent.json
index 247b6db82..4e462fa35 100644
--- a/data/folder-by-parent.json
+++ b/data/folder-by-parent.json
@@ -79,6 +79,7 @@
       "Multi-Team and DMs",
       "Permalink Preview",
       "Profile Settings",
+      "Schedule Messages",
       "Scroll",
       "Search",
       "Search Date Filter",
diff --git a/data/folders.json b/data/folders.json
index 69a543ddd..7588ef40d 100644
--- a/data/folders.json
+++ b/data/folders.json
@@ -688,6 +688,15 @@
     "fullNames": ["Channels", "Profile Settings"],
     "fullPath": "channels/profile-settings"
   },
+  {
+    "id": 18534840,
+    "parentId": 3142963,
+    "name": "Schedule Messages",
+    "index": 36,
+    "folderType": "TEST_CASE",
+    "fullNames": ["Channels", "Schedule Messages"],
+    "fullPath": "channels/schedule-messages"
+  },
   {
     "id": 404333,
     "parentId": 3142963,
diff --git a/data/key-and-path.json b/data/key-and-path.json
index 45a938a64..a7dc0c063 100644
--- a/data/key-and-path.json
+++ b/data/key-and-path.json
@@ -6311,5 +6311,12 @@
   { "key": "MM-T5639", "path": "mobile-v2/drafts", "id": 191284133 },
   { "key": "MM-T5640", "path": "desktop-app--native-specific-/landing-page", "id": 193404883 },
   { "key": "MM-T5641", "path": "notifications-banner", "id": 195498645 },
-  { "key": "MM-T5642", "path": "notifications-banner", "id": 195498646 }
+  { "key": "MM-T5642", "path": "notifications-banner", "id": 195498646 },
+  { "key": "MM-T5643", "path": "channels/schedule-messages", "id": 195718903 },
+  { "key": "MM-T5644", "path": "channels/schedule-messages", "id": 195718908 },
+  { "key": "MM-T5645", "path": "channels/schedule-messages", "id": 195718911 },
+  { "key": "MM-T5646", "path": "channels/schedule-messages", "id": 195718912 },
+  { "key": "MM-T5647", "path": "channels/schedule-messages", "id": 195718913 },
+  { "key": "MM-T5648", "path": "channels/schedule-messages", "id": 195718918 },
+  { "key": "MM-T5649", "path": "channels/schedule-messages", "id": 195718920 }
 ]
diff --git a/data/test-by-folder.json b/data/test-by-folder.json
index 639c674e7..626fa6d6c 100644
--- a/data/test-by-folder.json
+++ b/data/test-by-folder.json
@@ -1596,6 +1596,18 @@
       "Webapp: Nickname - Add"
     ]
   },
+  {
+    "folder": "channels/schedule-messages",
+    "tests": [
+      "Verify User can Delete a scheduled message in DM/GM/Channel",
+      "Verify User can Edit a scheduled message in DM/GM/Channel",
+      "Verify User can create a scheduled message from the Drafts Page",
+      "Verify User can create a scheduled message in DM/GM/Channel",
+      "Verify User can identify the cases for failed scheduled message",
+      "Verify User can remove scheduled setting from a scheduled message",
+      "Verify if the Failed scheduled message is sent out after server recovered from an outage issue"
+    ]
+  },
   {
     "folder": "channels/scroll",
     "tests": [
diff --git a/data/test-cases-folders.json b/data/test-cases-folders.json
index 2689b440c..2bdf7649b 100644
--- a/data/test-cases-folders.json
+++ b/data/test-cases-folders.json
@@ -75,6 +75,7 @@
   "channels/multi-team-and-dms": "Multi-Team and DMs",
   "channels/permalink-preview": "Permalink Preview",
   "channels/profile-settings": "Profile Settings",
+  "channels/schedule-messages": "Schedule Messages",
   "channels/scroll": "Scroll",
   "channels/search": "Search",
   "channels/search-date-filter": "Search Date Filter",
diff --git a/data/test-cases-manifest.json b/data/test-cases-manifest.json
index 105c57809..ee4336922 100644
--- a/data/test-cases-manifest.json
+++ b/data/test-cases-manifest.json
@@ -4835,6 +4835,39 @@
           }
         ]
       },
+      {
+        "name": "Schedule Messages",
+        "routes": [
+          {
+            "name": "Verify User can create a scheduled message in DM/GM/Channel",
+            "file": "channels/schedule-messages/MM-T5643.md"
+          },
+          {
+            "name": "Verify User can Edit a scheduled message in DM/GM/Channel",
+            "file": "channels/schedule-messages/MM-T5644.md"
+          },
+          {
+            "name": "Verify User can Delete a scheduled message in DM/GM/Channel",
+            "file": "channels/schedule-messages/MM-T5645.md"
+          },
+          {
+            "name": "Verify User can identify the cases for failed scheduled message",
+            "file": "channels/schedule-messages/MM-T5646.md"
+          },
+          {
+            "name": "Verify if the Failed scheduled message is sent out after server recovered from an outage issue",
+            "file": "channels/schedule-messages/MM-T5647.md"
+          },
+          {
+            "name": "Verify User can create a scheduled message from the Drafts Page",
+            "file": "channels/schedule-messages/MM-T5648.md"
+          },
+          {
+            "name": "Verify User can remove scheduled setting from a scheduled message",
+            "file": "channels/schedule-messages/MM-T5649.md"
+          }
+        ]
+      },
       {
         "name": "Scroll",
         "routes": [
diff --git a/data/test-cases-slugs.json b/data/test-cases-slugs.json
index 286d50c66..a7ca890ad 100644
--- a/data/test-cases-slugs.json
+++ b/data/test-cases-slugs.json
@@ -1305,6 +1305,13 @@
   "channels/profile-settings/mm-t4656",
   "channels/profile-settings/mm-t4914",
   "channels/profile-settings/mm-t711",
+  "channels/schedule-messages/mm-t5643",
+  "channels/schedule-messages/mm-t5644",
+  "channels/schedule-messages/mm-t5645",
+  "channels/schedule-messages/mm-t5646",
+  "channels/schedule-messages/mm-t5647",
+  "channels/schedule-messages/mm-t5648",
+  "channels/schedule-messages/mm-t5649",
   "channels/scroll/mm-t2365",
   "channels/scroll/mm-t2366",
   "channels/scroll/mm-t2367",
diff --git a/data/test-cases-toc.json b/data/test-cases-toc.json
index c957bfbd5..cf35d9269 100644
--- a/data/test-cases-toc.json
+++ b/data/test-cases-toc.json
@@ -13888,6 +13888,34 @@
     "name": "No Performance issues or channel locking",
     "slug": "channels/scroll/mm-t2379"
   },
+  "channels/schedule-messages/mm-t5648": {
+    "name": "Verify User can create a scheduled message from the Drafts Page",
+    "slug": "channels/schedule-messages/mm-t5648"
+  },
+  "channels/schedule-messages/mm-t5649": {
+    "name": "Verify User can remove scheduled setting from a scheduled message",
+    "slug": "channels/schedule-messages/mm-t5649"
+  },
+  "channels/schedule-messages/mm-t5646": {
+    "name": "Verify User can identify the cases for failed scheduled message",
+    "slug": "channels/schedule-messages/mm-t5646"
+  },
+  "channels/schedule-messages/mm-t5647": {
+    "name": "Verify if the Failed scheduled message is sent out after server recovered from an outage issue",
+    "slug": "channels/schedule-messages/mm-t5647"
+  },
+  "channels/schedule-messages/mm-t5643": {
+    "name": "Verify User can create a scheduled message in DM/GM/Channel",
+    "slug": "channels/schedule-messages/mm-t5643"
+  },
+  "channels/schedule-messages/mm-t5644": {
+    "name": "Verify User can Edit a scheduled message in DM/GM/Channel",
+    "slug": "channels/schedule-messages/mm-t5644"
+  },
+  "channels/schedule-messages/mm-t5645": {
+    "name": "Verify User can Delete a scheduled message in DM/GM/Channel",
+    "slug": "channels/schedule-messages/mm-t5645"
+  },
   "channels/autocomplete/mm-t3393": {
     "name": "RN apps: Autocomplete - Search",
     "slug": "channels/autocomplete/mm-t3393"
diff --git a/data/test-cases/channels/messaging/MM-T3319.md b/data/test-cases/channels/messaging/MM-T3319.md
index c70911e7f..a7160774f 100644
--- a/data/test-cases/channels/messaging/MM-T3319.md
+++ b/data/test-cases/channels/messaging/MM-T3319.md
@@ -37,7 +37,7 @@ key: MM-T3319
 created_on: "2020-08-20T17:49:26Z"
 last_updated: ""
 case_hashed: 3bc7d5004be92ac6b96a05e397b28bd9f4fdeba390513f636c2d63f112583d705b4a74d1ba01fa1f403afe79d5418c6b
-steps_hashed: a8a944c457ccda0b1139f8d6680092f1ad2c456c2f158bc20faa2ec77323a84fced6f1df26ba8aa4214f186155e5f895
+steps_hashed: 6225261c601f271ab9f981220bc287f8bc1223a2c51a40da406ae9f94c8e79ef2e643edbdcd89a5aabfb0a05bca46ea9
 ---
 
 <!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
diff --git a/data/test-cases/channels/schedule-messages/MM-T5643.md b/data/test-cases/channels/schedule-messages/MM-T5643.md
new file mode 100644
index 000000000..424fefc19
--- /dev/null
+++ b/data/test-cases/channels/schedule-messages/MM-T5643.md
@@ -0,0 +1,175 @@
+---
+# (Required) Ensure all values are filled up
+name: "Verify User can create a scheduled message in DM/GM/Channel"
+status: Active
+priority: Normal
+folder: Schedule Messages
+authors: "@yasserfaraazkhan"
+team_ownership:
+- ICU
+priority_p1_to_p4: P3 - Deep Functions (Do extensive scenarios work?)
+
+# (Optional)
+location: Messaging
+component: null
+tags: []
+labels: []
+tested_by_contributor: ""
+
+# (Optional) Test type and tools
+cypress: N/A
+detox: N/A
+mmctl: N/A
+playwright: N/A
+rainforest: []
+manual_test_environments: []
+
+# Do not change
+id: 195718903
+key: MM-T5643
+created_on: "2024-10-24T08:45:27Z"
+last_updated: "2024-10-24T14:15:26Z"
+case_hashed: d05be8ac2af60609427fea7e4ee82f58a9343edc6037c08db842d12b7c2826b98fca93f58f5df52da8346998f5be98cb
+steps_hashed: 13a9765fcfdaa0ac676509d3b411db184d528a1d71592358de836b41f9c07a7c992c08aba61ca2b18cf1b8aa3c71038b
+---
+
+<!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
+
+## MM-T5643: Verify User can create a scheduled message in DM/GM/Channel
+
+---
+
+**Step 1**
+
+### Scenario 1: Able to schedule a message to a future Date in GM/Channel
+
+Steps:
+
+1. Log into User's account.
+
+2. Type a message in the GM/Channel post text box.
+
+3. Click on the Dropdown beside Send button.
+
+4. Choose a pre-defined Date from the options.
+
+5. Verify the message is scheduled and user can see one of the below mentioned messages in the Channel
+
+   - If the message is scheduled for today, show “Message scheduled for today at 3:00 PM.”
+   - If the message is scheduled for the next day, show “Message scheduled for tomorrow at 3:00 PM.”
+   - If the message is scheduled within a week, show “Message scheduled for Monday at 3:00 PM.”
+   - If the message is scheduled >= 1 week, show “Message scheduled for Oct 16 at 3:00 PM.”
+
+6. Verify User can see an option `See all scheduled messages`.
+
+7. Click on `See all scheduled messages`.
+
+8. Verify user is taken to Scheduled tab and can see the Scheduled messages.
+
+9. The messages should have a tag `Scheduled` and the time mentioned and have one of the below messages displayed
+
+   - If the message is scheduled for today, show “Send today at 3:00 PM”
+   - If the message is scheduled for the next day, show “Send tomorrow at 3:00 PM”
+   - If the message is scheduled within a week, show “Send Monday at 3:00 PM”
+   - If the message is scheduled >= 1 week, show “Send Oct 16 at 3:00 PM”
+
+### Scenario 2: Able to schedule Multiple message in GM/Channel
+
+1. Follow above steps to create one more scheduled message.
+2. Verify User can see number of messages scheduled in a channel. Example: the user should see `2 messages scheduled to be sent. See all scheduled messages`.
+
+### Scenario 3: Able to schedule a message in a DM.
+
+1. Log into User's account.
+2. Open a Direct message with User A.
+3. Type a message in the text box.
+4. Click on the Dropdown beside Send button. example: Tomorrow at 9:00 AM
+   - If the User A is in different timezone. the option should show `Tomorrow at 9:00 AM. 10:00 AM User A's time`.
+5. Choose a pre-defined Date from the options.
+6. Verify the message is scheduled and user can see the message `Your draft has been scheduled for tomorrow at 9:00 AM <current user's time zone>`.
+7. Click on `See all scheduled messages`.
+8. Verify user is taken to Scheduled tab and can see the Scheduled message.
+
+### Scenario 4: Able to schedule a message on a custom time in GM/Channel
+
+1. Log into User's account.
+2. Type a message in the GM/Channel post text box.
+3. Click on the Dropdown beside Send button.
+4. Click on `Choose a custom time`.
+5. Verify a modal is opened and by default the date is set to `Tomorrow` and time is `09:00 AM`
+   - If its a DM then the Modal should show time on which user will receive the message. Example: `<Day> at <time> for Username`.
+6. Click on `See all scheduled messages`.
+7. Verify user is taken to Scheduled tab and can see the Scheduled message.
+
+### Scenario 5: Able to schedule a message within a Threaded message with no replies
+
+1. Log into User's account.
+
+2. Create a root post in a Channel.
+
+3. Open the thread on the RHS.
+
+4. Schedule a message.
+
+5. Verify user can see a message saying `You have <#Number> scheduled message. <link> See all <link>`
+
+6. Go to Threads page.
+
+7. Open the thread where above message is scheduled.
+
+8. Verify user can see one of the below messages
+
+   - If the message is scheduled for today, show “Message scheduled for today at 3:00 PM.”
+   - If the message is scheduled for the next day, show “Message scheduled for tomorrow at 3:00 PM.”
+   - If the message is scheduled within a week, show “Message scheduled for Monday at 3:00 PM.”
+   - If the message is scheduled >= 1 week, show “Message scheduled for Oct 16 at 3:00 PM.”
+
+9. Let the scheduled message be launched.
+
+10. Verify the root post has scheduled message as a reply under it.
+
+11. Verify the User is following the thread (based on the setting in System Console > Posts > Automatically Follow Threads)
+
+### Scenario 6: Able to schedule a message with attachments
+
+1. Log into User's account.
+2. Create a threaded post with attachments like Image, Video, PDF in a Channel.
+3. Click on the Dropdown beside Send button.
+4. Choose a pre-defined Date from the options.
+5. Goto Scheduled tab.
+6. Verify the newly scheduled message is visible with attachments.
+
+### Scenario 7: Able to view attachments in the scheduled message
+
+1. Log into User's account.
+2. Create a threaded post with attachments like Image, Video, PDF in a Channel.
+3. Click on the Dropdown beside Send button.
+4. Choose a pre-defined Date from the options.
+5. Go to Scheduled tab.
+6. Verify the newly scheduled message is visible with attachments in the Scheduled tab.
+
+### Scenario 8: Able to see User's timezome in the DM Channel when scheduling a message
+
+1. Log into User's account.
+2. Open a DM with User B.
+3. Verify User B's timezone is shown before post text box.
+4. Schedule a message dropdown.
+5. Verify below the options `Tomorrow at`, `Monday at` the User B's time is also displayed.
+6. Click on `Choose a custom time`.
+7. Select Date and time.
+8. Verify the User B's timezone is displayed on the schedule message modal.
+
+### Scenario 9: Able to send scheduled message immediately
+
+1. Log into User's account.
+2. Type a message in the DM/GM/Channel post text box.
+3. Click on the Dropdown beside Send button.
+4. Click on `Choose a custom time`.
+5. Verify a modal is opened and by default the date is set to `Tomorrow` and time is `09:00 AM`.
+6. Click on `Scheduled` button.
+7. Click on `See all scheduled messages`.
+8. Verify user is taken to Scheduled tab and can see the Scheduled message.
+9. Hover on the scheduled message.
+10. Click on `Send` button.
+11. Verify user is take to the DM/GM/Channel.
+12. Veerify the scheduled post is visible in the channel.
diff --git a/data/test-cases/channels/schedule-messages/MM-T5644.md b/data/test-cases/channels/schedule-messages/MM-T5644.md
new file mode 100644
index 000000000..0d0cd568a
--- /dev/null
+++ b/data/test-cases/channels/schedule-messages/MM-T5644.md
@@ -0,0 +1,71 @@
+---
+# (Required) Ensure all values are filled up
+name: "Verify User can Edit a scheduled message in DM/GM/Channel"
+status: Active
+priority: Normal
+folder: Schedule Messages
+authors: "@yasserfaraazkhan"
+team_ownership:
+- ICU
+priority_p1_to_p4: P3 - Deep Functions (Do extensive scenarios work?)
+
+# (Optional)
+location: Messaging
+component: null
+tags: []
+labels: []
+tested_by_contributor: ""
+
+# (Optional) Test type and tools
+cypress: N/A
+detox: N/A
+mmctl: N/A
+playwright: N/A
+rainforest: []
+manual_test_environments: []
+
+# Do not change
+id: 195718908
+key: MM-T5644
+created_on: "2024-10-24T08:45:28Z"
+last_updated: "2024-10-24T14:15:27Z"
+case_hashed: fecbed81e87876cb1d9d3d2cc4747c754506eccbcbd26db431dc1e67dae7ebcabeb34ac9f70bc16bc505a45103d4aa82
+steps_hashed: 169079b92eb1a7f486aefe441f26138f3a9119beeea9ba80cdf369f7cc5c2ded7061763f94347409bc03978a572c9e86
+---
+
+<!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
+
+## MM-T5644: Verify User can Edit a scheduled message in DM/GM/Channel
+
+---
+
+**Step 1**
+
+Prerequisites:
+
+1. Should have scheduled messages in a DM/GM/Channel.
+
+### Scenario 1: Able to Edit the contents of a scheduled message.
+
+Steps:
+
+1. Log into User's account.
+2. Go to `Scheduled` tab under Drafts page.
+3. Hover on the message you want to edit.
+4. Click on `Edit` icon.
+5. Update the post text.
+6. Click on Save.
+7. Verify the post is updated.
+
+### Scenario 2: Able to reschedule the time.
+
+Steps:
+
+1. Log into User's account.
+2. Go to `Scheduled` tab under Drafts page.
+3. Hover on the message you want to edit.
+4. Click on `Reschedule` icon.
+5. Verify a Modal is opened.
+6. Update the date and time to something in future.
+7. Click on Save button.
+8. Verify the Scheduled message time is updated to a future date.
diff --git a/data/test-cases/channels/schedule-messages/MM-T5645.md b/data/test-cases/channels/schedule-messages/MM-T5645.md
new file mode 100644
index 000000000..1d3a16d49
--- /dev/null
+++ b/data/test-cases/channels/schedule-messages/MM-T5645.md
@@ -0,0 +1,59 @@
+---
+# (Required) Ensure all values are filled up
+name: "Verify User can Delete a scheduled message in DM/GM/Channel"
+status: Active
+priority: Normal
+folder: Schedule Messages
+authors: "@yasserfaraazkhan"
+team_ownership:
+- ICU
+priority_p1_to_p4: P3 - Deep Functions (Do extensive scenarios work?)
+
+# (Optional)
+location: Messaging
+component: null
+tags: []
+labels: []
+tested_by_contributor: ""
+
+# (Optional) Test type and tools
+cypress: N/A
+detox: N/A
+mmctl: N/A
+playwright: N/A
+rainforest: []
+manual_test_environments: []
+
+# Do not change
+id: 195718911
+key: MM-T5645
+created_on: "2024-10-24T08:45:28Z"
+last_updated: "2024-10-24T14:15:28Z"
+case_hashed: 8f04b9a64f576a86650f72fbab6b5af11a343133e88b8a890b17892d5b0f39c567916b57ecf108d47265e81dca4cc078
+steps_hashed: 06fb288190a825da410aef4ebffdb2cfdd7181a7f56926fd4957d554c03774bb0e35fa71fa3eaf9a9e7acadcc939c83a
+---
+
+<!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
+
+## MM-T5645: Verify User can Delete a scheduled message in DM/GM/Channel
+
+---
+
+**Step 1**
+
+Prerequisites:
+
+1. Should have scheduled messages in a DM/GM/Channel.
+
+### Scenario 1: Able to Delete the scheduled message.
+
+Steps:
+
+1. Log into User's account.
+2. Go to `Scheduled` tab under Drafts page.
+3. Hover on the message you want to edit.
+4. Click on `Delete` icon.
+5. Verify a confirmation prompt is shown.
+6. Click on `Confirm` button.
+7. Verify the post is deleted.
+8. Go to Channel and verify the number of scheduled message is reduced.
diff --git a/data/test-cases/channels/schedule-messages/MM-T5646.md b/data/test-cases/channels/schedule-messages/MM-T5646.md
new file mode 100644
index 000000000..27bfe577a
--- /dev/null
+++ b/data/test-cases/channels/schedule-messages/MM-T5646.md
@@ -0,0 +1,117 @@
+---
+# (Required) Ensure all values are filled up
+name: "Verify User can identify the cases for failed scheduled message"
+status: Active
+priority: Normal
+folder: Schedule Messages
+authors: "@yasserfaraazkhan"
+team_ownership:
+- ICU
+priority_p1_to_p4: P3 - Deep Functions (Do extensive scenarios work?)
+
+# (Optional)
+location: Messaging
+component: null
+tags: []
+labels: []
+tested_by_contributor: ""
+
+# (Optional) Test type and tools
+cypress: N/A
+detox: N/A
+mmctl: N/A
+playwright: N/A
+rainforest: []
+manual_test_environments: []
+
+# Do not change
+id: 195718912
+key: MM-T5646
+created_on: "2024-10-24T08:45:29Z"
+last_updated: "2024-10-24T14:15:28Z"
+case_hashed: 47a790a927fa1bb32d7f7935769917b072259f9132647c0c0c3a6ff99bb1ad907cd2159267dc1d27f90f725df9880e26
+steps_hashed: c74ddcb05daff4081c11fd479ae9b61f129cbfc816ea52172a88fcbdab56deb72c4616bc90871df64a3270d5ef1e667a
+---
+
+<!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
+
+## MM-T5646: Verify User can identify the cases for failed scheduled message
+
+---
+
+**Step 1**
+
+Prerequisites:
+
+1. Should have scheduled messages as root post in a DM/GM/Channel.
+
+### Scenario 1: Should not send message if User is not in the Channel anymore.
+
+Steps:
+
+1. Log into User's account.
+2. Leave the channel where a message was scheduled to be sent.
+3. Go to Scheduled tab in Drafts page.
+4. Verify the Error message is on the top of the list.
+5. Verify there is a Header `<number> of your scheduled drafts cannot be sent`.
+6. Verify the User can see Error message `You’re not a member anymore of the channel.`.
+7. Verify the message has a tag `NOT IN THE CHANNEL` in red alert.
+
+### Scenario 2: Should not send message if Channel is Archived.
+
+1. Log into User's account.
+2. Archive the channel where a message was scheduled to be sent.
+3. Go to Scheduled tab in Drafts page.
+4. Verify the User can see Error message `CHANNEL IS ARCHIVED`.
+5. Verify the message has a tag `CHANNEL IS ARCHIVED` in red alert.
+
+### Scenario 3: Should not send message if Channel is Read-only.
+
+1. Log into Admin's account.
+2. Go to Channel settings.
+3. Disable `Create Posts` permission for the channel.
+4. Log into User's account.
+5. Go to Scheduled tab in Drafts page.
+6. Verify the User can see Error message `CHANNEL IS READ-ONLY`.
+7. Verify the message has a tag `CHANNEL IS READ-ONLY` in red alert.
+
+### Scenario 4: Should not send message if User is removed from a Private Channel.
+
+1. Log into User's account.
+2. Leave the Private channel where User had some scheduled messages.
+3. Go to Scheduled tab in Drafts page.
+4. Verify the message has a tag `NOT IN THE CHANNEL` in red alert.
+5. Verify the User can see `No Channel` in the Channels section.
+
+### Scenario 5: Verify LHS Count displayed when scheduled message fails to be sent.
+
+1. Log into User's account.
+2. Verify there is no error icon near Drafts on the LHS
+3. Leave the channel where a message was scheduled to be sent.
+4. Verify the user can see Error icon in red color.
+5. Hover on the Icon a tooltip saying `One of your scheduled drafts cannot be sent`.
+6. Go to Scheduled tab in Drafts page.
+7. Hover on the Failed message and delete it.
+8. Verify the Error message is not shown on the LHS anymore.
+
+### Scenario 6: Verify Schedule message fails if the root post is moved to Private channel on the same team.
+
+1. Log into User A's account and create a Root post in a channel.
+2. Reply to the root post with some messages.
+3. Log into User B's account and create a threaded scheduled message on the root post.
+4. From User A's account, Using **Move Threads** feature, move the root post to a private Channel where User B is not a member.
+5. Log into User B's account.
+6. Go to Scheduled messages tab.
+7. Verify the message has a tag `NOT IN THE CHANNEL` in red alert.
+8. Verify the User can see `No Channel` in the Channels section.
+
+### Scenario 7: Verify Schedule message fails if the root post is moved to another team.
+
+1. Log into User A's account and create a Root post in a channel.
+2. Reply to the root post with some messages.
+3. Log into User B's account and create a threaded scheduled message on the root post.
+4. From User A's account, Using **Move Threads** feature, move the root post to another Team where User B is not a member.
+5. Log into User B's account.
+6. Go to Scheduled messages tab.
+7. Verify the message has a tag `NOT IN THE CHANNEL` in red alert.
+8. Verify the User can see `No Channel` in the Channels section.
diff --git a/data/test-cases/channels/schedule-messages/MM-T5647.md b/data/test-cases/channels/schedule-messages/MM-T5647.md
new file mode 100644
index 000000000..bc91ec19d
--- /dev/null
+++ b/data/test-cases/channels/schedule-messages/MM-T5647.md
@@ -0,0 +1,69 @@
+---
+# (Required) Ensure all values are filled up
+name: "Verify if the Failed scheduled message is sent out after server recovered from an outage issue"
+status: Active
+priority: Normal
+folder: Schedule Messages
+authors: "@yasserfaraazkhan"
+team_ownership:
+- ICU
+priority_p1_to_p4: P3 - Deep Functions (Do extensive scenarios work?)
+
+# (Optional)
+location: Messaging
+component: null
+tags: []
+labels: []
+tested_by_contributor: ""
+
+# (Optional) Test type and tools
+cypress: N/A
+detox: N/A
+mmctl: N/A
+playwright: N/A
+rainforest: []
+manual_test_environments: []
+
+# Do not change
+id: 195718913
+key: MM-T5647
+created_on: "2024-10-24T08:45:30Z"
+last_updated: "2024-10-24T14:15:29Z"
+case_hashed: f6de5f49ee39445a467da194f84f2a4635a2e4e70dcb8f568d725f5ff50523253779c6240e4fce27d90a3932395cdb9f
+steps_hashed: 26e08a32ad1d36b6cb3efff03238ad5c5e996cdfa1e6db089c231794c34b70ce144deaf370865e1422aa7df3c6613ed4
+---
+
+<!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
+
+## MM-T5647: Verify if the Failed scheduled message is sent out after server recovered from an outage issue
+
+---
+
+**Step 1**
+
+Prerequisites:
+
+1. Should have scheduled messages in a DM/GM/Channel.
+
+### Scenario 1: The server recovers within a timestamp of 30 minutes and the message is sent out
+
+Steps:
+
+1. Log into User's account.
+
+2. Simulate server outage for a time period when the message was scheduled.
+
+   - Option 1: Use Jmeter or k6 tool to generate huge traffic on the server.
+   - Option 2: If the instance is created using Cloud plugin, try options like `--database` or `hibernate`
+
+3. Wait till the scheduled message fails due to server outage
+
+4. Once the serer recovers, Verify if the scheduled message is sent out within 30 mins.
+
+### Scenario 2: The server does not recover within a timestamp of 30 minutes. Message is marked as Failed.
+
+1. Log into User's account.
+2. Simulate server outage for a longer time period when the message was scheduled.
+3. Verify that the message is not sent to the channel.
+4. Hover on the message.
+5. Verify User only gets option to Copy text and Delete option.
diff --git a/data/test-cases/channels/schedule-messages/MM-T5648.md b/data/test-cases/channels/schedule-messages/MM-T5648.md
new file mode 100644
index 000000000..5a07af90a
--- /dev/null
+++ b/data/test-cases/channels/schedule-messages/MM-T5648.md
@@ -0,0 +1,61 @@
+---
+# (Required) Ensure all values are filled up
+name: "Verify User can create a scheduled message from the Drafts Page"
+status: Active
+priority: Normal
+folder: Schedule Messages
+authors: "@yasserfaraazkhan"
+team_ownership:
+- ICU
+priority_p1_to_p4: P3 - Deep Functions (Do extensive scenarios work?)
+
+# (Optional)
+location: Messaging
+component: null
+tags: []
+labels: []
+tested_by_contributor: ""
+
+# (Optional) Test type and tools
+cypress: N/A
+detox: N/A
+mmctl: N/A
+playwright: N/A
+rainforest: []
+manual_test_environments: []
+
+# Do not change
+id: 195718918
+key: MM-T5648
+created_on: "2024-10-24T08:45:31Z"
+last_updated: "2024-10-24T14:15:30Z"
+case_hashed: 931541ad589c1718c7b81f2c0e63d0714b8955553caf94146bbac2bc883ce599b58655aa7e75c143af6bb6339f0c707e
+steps_hashed: 0de0e5a7ed29190e0be3ef65a0c482f98e64730344abbb7fa4c65745ba828bc03f1881723f2e0a642c91c20dd0d99edf
+---
+
+<!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
+
+## MM-T5648: Verify User can create a scheduled message from the Drafts Page
+
+---
+
+**Step 1**
+
+### Scenario 1: Able to add schedule to the Draft message.
+
+Steps:
+
+1. Log into User's account.
+2. Type a message in the DM/GM/Channel post text box to create a Draft message.
+3. Go to Drafts page.
+4. Verify the Draft is created and has channel name and date of creation.
+5. Hover on the Draft.
+6. Click on the Schedule icon.
+7. Verify a modal to select Date and time appears.
+8. Select a Future date and click on `Schedule` button.
+9. Verify the message is not seen under Drafts tab.
+10. Go to Scheduled tab.
+11. Verify the Scheduled message appears on the top.
+12. Go to the DM/GM/Channel where the draft was created.
+13. Verify the message post is not typed in the text box.
+14. Verify the `Message Scheduled for ..` is updated in the channel.
diff --git a/data/test-cases/channels/schedule-messages/MM-T5649.md b/data/test-cases/channels/schedule-messages/MM-T5649.md
new file mode 100644
index 000000000..ba60e99a1
--- /dev/null
+++ b/data/test-cases/channels/schedule-messages/MM-T5649.md
@@ -0,0 +1,60 @@
+---
+# (Required) Ensure all values are filled up
+name: "Verify User can remove scheduled setting from a scheduled message"
+status: Active
+priority: Normal
+folder: Schedule Messages
+authors: "@yasserfaraazkhan"
+team_ownership:
+- ICU
+priority_p1_to_p4: P3 - Deep Functions (Do extensive scenarios work?)
+
+# (Optional)
+location: Messaging
+component: null
+tags: []
+labels: []
+tested_by_contributor: ""
+
+# (Optional) Test type and tools
+cypress: N/A
+detox: N/A
+mmctl: N/A
+playwright: N/A
+rainforest: []
+manual_test_environments: []
+
+# Do not change
+id: 195718920
+key: MM-T5649
+created_on: "2024-10-24T08:45:32Z"
+last_updated: "2024-10-24T14:15:31Z"
+case_hashed: 3efb3527eb0c1860c1abbb0a06e0f0ae45fc39198331bbe5a5a66fe270d072fd32057ae10c1f2b0dfb619c2a394ca40b
+steps_hashed: c0e9308a71b35b72ba39fd12343095eeeae1661921de38f381426be48961e071e8f2873de25ce051e5c7f768761d322a
+---
+
+<!-- (Auto-generated) Based on frontmatter's "key" and "name" -->
+
+## MM-T5649: Verify User can remove scheduled setting from a scheduled message
+
+---
+
+**Step 1**
+
+### Scenario 1: Able to add schedule to the Draft message.
+
+Steps:
+
+1. Log into User's account.
+2. Go to Scheduled tab.
+3. Verify the Draft is created and has channel name and date of creation.
+4. Hover on the Draft.
+5. Click on the Schedule icon.
+6. Verify a modal to select Date and time appears.
+7. Select a Future date and click on `Schedule` button.
+8. Verify the message is not seen under Drafts tab.
+9. Go to Scheduled tab.
+10. Verify the Scheduled message appears on the top.
+11. Go to the DM/GM/Channel where the draft was created.
+12. Verify the message post is not typed in the text box.
+13. Verify the `Message Scheduled for ..` is updated in the channel.