diff --git a/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt b/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt
index 7e2ae4b59..d66afe528 100644
--- a/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt
+++ b/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt
@@ -80,15 +80,21 @@ fun SubtaskRow(
         },
         content = {
             Column {
-                val isGoogleTaskChild =
+                val subtasksDisabled =
                     hasParent &&
-                            filter.isGoogleTasks &&
-                            originalFilter.isGoogleTasks &&
+                            !filter.isIcalendar &&
+                            !originalFilter.isIcalendar &&
                             originalFilter.uuid == filter.uuid
-                if (isGoogleTaskChild) {
+                if (subtasksDisabled) {
                     DisabledText(
-                        text = stringResource(id = org.tasks.R.string.subtasks_multilevel_google_task),
-                        modifier = Modifier.padding(top = 20.dp, bottom = 20.dp, end = 16.dp)
+                        text = stringResource(
+                            id = if (filter.isGoogleTasks) {
+                                org.tasks.R.string.subtasks_multilevel_google_task
+                            } else {
+                                org.tasks.R.string.subtasks_multilevel_microsoft
+                            }
+                        ),
+                        modifier = Modifier.padding(start = 12.dp, top = 20.dp, bottom = 20.dp, end = 16.dp)
                     )
                 } else {
                     Spacer(modifier = Modifier.height(height = 8.dp))
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e1dc1839..a0ca71b86 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -518,6 +518,7 @@ File %1$s contained %2$s.\n\n
   <string name="expand_subtasks">Expand subtasks</string>
   <string name="collapse_subtasks">Collapse subtasks</string>
   <string name="subtasks_multilevel_google_task">Multi-level subtasks not supported by Google Tasks</string>
+  <string name="subtasks_multilevel_microsoft">Multi-level subtasks not supported by Microsoft To Do</string>
   <string name="enter_tag_name">Enter tag name</string>
   <string name="choose_synchronization_service">Select a platform</string>
   <string name="tasks_org_description">Synchronize your tasks with Tasks.org</string>