diff --git a/TODO.md b/TODO.md
index 4a8f56be..1cf54d97 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,11 +4,12 @@
   - Theming
     - File format
     - Make all icon SVG files white/black, since we can now use ColorOverlay
+      - Gray colored buttons when disabled
     - Make the icon blue in EditAccount when hovering and no avatar set
     - Remove the filled theme
     - Have a default background
 
-  - Sendbox
+  - Composer
   - Room Sidepane
     - Hide when window too small
     - Also save/load its size
@@ -32,6 +33,9 @@
   - Terrible performance using `QT_QPA_PLATFORM=wayland-egl`, must use `xcb`
 
 - UI
+  - When starting a long task, e.g. importing keys, quitting the page,
+    and coming back, show the buttons as still loading until operation is done
+
   - Choose a better default easing type for animations
   - Make invite icon blink if there's no one but ourself in the room,
     but never do it again once the user hovered it long enough to show tooltip
@@ -40,11 +44,8 @@
   - Remove first html lists left margin
   - Adapt UI for small heights
 
-  - Popup:
-    - Transitions
-
   - Restoring UI state:
-    - Sendbox content
+    - Composer content
     - Which element was focused
     - Room member filter field
 
@@ -52,8 +53,6 @@
     from sharing a too similar hue
   - Combine events so they take less space
     - After combining is implemented, no need to hide our own profile changes.
-  - When starting a long task, e.g. importing keys, quitting the page,
-    and coming back, show the buttons as still loading until operation is done
   - Make invite/left banners look better in column mode
   - Replies
   - Messages editing
@@ -89,7 +88,7 @@
   - Register/Forgot? for SignIn dialog
   - Add room
   - Logout & leave/forget room warning popup
-  - Prevent using the SendBox if no permission (power levels)
+  - Prevent using the composer if no permission (power levels)
     - Prevent using an alias if that user is not in the room or no permission
   - Spinner when loading past room events or images 
 
@@ -116,7 +115,7 @@
     - Edit/delete own devices
     - Request room keys from own other devices
     - Auto-trust accounts within the same client
-    - Import/export keys
+    - Export keys
   - Uploads & proper http thumbnails
     - Reduce messages ListView cacheBuffer height once http thumbnails
       downloading is implemented 
diff --git a/src/qml/Chat/ChatSplitView.qml b/src/qml/Chat/ChatSplitView.qml
index 871952c6..3d42b5a4 100644
--- a/src/qml/Chat/ChatSplitView.qml
+++ b/src/qml/Chat/ChatSplitView.qml
@@ -7,7 +7,7 @@ import "RoomSidePane"
 
 HSplitView {
     id: chatSplitView
-    Component.onCompleted: sendBox.setFocus()
+    Component.onCompleted: composer.setFocus()
 
     HColumnLayout {
         Layout.fillWidth: true
@@ -30,8 +30,8 @@ HSplitView {
             Layout.fillWidth: true
         }
 
-        SendBox {
-            id: sendBox
+        Composer {
+            id: composer
             visible: ! inviteBanner.visible && ! leftBanner.visible
         }
 
diff --git a/src/qml/Chat/SendBox.qml b/src/qml/Chat/Composer.qml
similarity index 97%
rename from src/qml/Chat/SendBox.qml
rename to src/qml/Chat/Composer.qml
index 0da1df39..134d889f 100644
--- a/src/qml/Chat/SendBox.qml
+++ b/src/qml/Chat/Composer.qml
@@ -45,12 +45,12 @@ Rectangle {
     //      "ltuc <" + lineTextUntilCursor + ">", "dob",
     //      deleteCharsOnBackspace, "m", lineTextUntilCursor.match(/^ +$/))
 
-    id: sendBox
+    id: composer
     Layout.fillWidth: true
     Layout.minimumHeight: theme.baseElementsHeight
     Layout.preferredHeight: areaScrollView.implicitHeight
     Layout.maximumHeight: pageLoader.height / 2
-    color: theme.chat.sendBox.background
+    color: theme.chat.composer.background
 
     HRowLayout {
         anchors.fill: parent
@@ -65,7 +65,7 @@ Rectangle {
         HScrollableTextArea {
             Layout.fillHeight: true
             Layout.fillWidth: true
-            Layout.topMargin: Math.max(0, sendBox.Layout.minimumHeight - 34)
+            Layout.topMargin: Math.max(0, composer.Layout.minimumHeight - 34)
 
             id: areaScrollView
             placeholderText: qsTr("Type a message...")
diff --git a/src/themes/Default.qpl b/src/themes/Default.qpl
index 6de43a88..0e2e100d 100644
--- a/src/themes/Default.qpl
+++ b/src/themes/Default.qpl
@@ -282,5 +282,5 @@ chat:
     typingMembers:
         color background: colors.mediumBackground
 
-    sendBox:
+    composer:
         color background: colors.strongBackground