1 files changed, 10 insertions, 3 deletions

diff --git a/views/composer/qml/View.qml b/views/composer/qml/View.qml
index 9afc5316..ffab3545 100644
--- a/views/composer/qml/View.qml
+++ b/views/composer/qml/View.qml
@@ -36,7 +36,6 @@ Kube.View {
     resources: [
         Kube.ComposerController {
             id: composerController
-            htmlBody: html.checked
             sign: signCheckbox.checked
             encrypt: encryptCheckbox.checked
             onDone: root.done()
@@ -305,6 +304,9 @@ Kube.View {
                     focusPolicy: Qt.TabFocus
                     focus: false
                     checked: false
+                    onCheckedChanged: {
+                        textEditor.htmlEnabled = checked
+                    }
                 }
 
                 Row {
@@ -369,12 +371,17 @@ Kube.View {
 
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                htmlEnabled: html.checked
+                onHtmlEnabledChanged: {
+                    html.checked = htmlEnabled
+                    composerController.htmlBody = htmlEnabled;
+                }
 
                 onActiveFocusChanged: closeFirstSplitIfNecessary()
                 Keys.onEscapePressed: recipients.forceActiveFocus()
                 initialText: composerController.body
-                onTextChanged: composerController.body = text;
+                onTextChanged: {
+                    composerController.body = text;
+                }
             }
         }
     }