Reset composer when recycling chat page

src/gui/Base/HTextArea.qml

@@ -38,6 +38,10 @@ TextArea {
         text = Qt.binding(() => defaultText || "")
     }
 
+    function loadState() {
+        if (! text) insertAtCursor(window.getState(this, "text", ""))
+    }
+
     function insertAtCursor(text) {
         insert(cursorPosition, text)
     }
@@ -87,9 +91,7 @@ TextArea {
     Component.onCompleted: {
         // Break binding
         previousDefaultText = previousDefaultText
-
+        loadState()
-        // Set it only on component creation to avoid binding loops
-        if (! text) insertAtCursor(window.getState(this, "text", ""))
     }
 
     onTextChanged: window.saveState(this)

src/gui/Base/HTextField.qml

@@ -34,6 +34,10 @@ TextField {
         text = Qt.binding(() => defaultText || "")
     }
 
+    function loadState() {
+        if (! text) insertAtCursor(window.getState(this, "text", ""))
+    }
+
     function insertAtCursor(text) {
         insert(cursorPosition, text)
     }
@@ -74,9 +78,7 @@ TextField {
     Component.onCompleted: {
         // Break binding
         previousDefaultText = previousDefaultText
-
+        loadState()
-        // Set it only on component creation to avoid binding loops
-        if (! text) insertAtCursor(window.getState(this, "text", ""))
     }
 
     onTextChanged: window.saveState(this)

src/gui/Pages/Chat/Composer/MessageArea.qml

@@ -245,4 +245,13 @@ HTextArea {
         //     )
         // }
     }
+
+    Connections {
+        target: pageLoader
+
+        function onRecycled() {
+            area.reset()
+            area.loadState()
+        }
+    }
 }