diff --git a/changelog.d/7466.bugfix b/changelog.d/7466.bugfix
new file mode 100644
index 00000000000..bcca741d27f
--- /dev/null
+++ b/changelog.d/7466.bugfix
@@ -0,0 +1 @@
+Restore formatting when restoring a draft. Also keep formatting when switching composer mode.