diff --git a/FEATURES.md b/FEATURES.md
new file mode 100644
index 0000000..e4a928b
--- /dev/null
+++ b/FEATURES.md
@@ -0,0 +1,20 @@
+# Features and changes compared to upstream
+
+Note that this list may be incomplete or outdated.
+
+
+## General UI
+
+... TODO Schildi theme?
+
+
+## Chat overview ("room list")
+
+- Unified room list instead of separating DMs and groups (TODO: setting)
+- Do not exclude currently selected room when updating room sort order
+- Do not force muted rooms to be sorted at the bottom
+
+
+## Conversation screen
+
+- Render captions