5 files changed, 31 insertions, 4 deletions
diff --git a/framework/qml/TextEditor.qml b/framework/qml/TextEditor.qml
index e5cc665c..7b1c5dee 100644
--- a/framework/qml/TextEditor.qml
+++ b/framework/qml/TextEditor.qml
@@ -34,6 +34,7 @@ FocusScope {
    property string initialText
    onInitialTextChanged: {
+        htmlEnabled = document.isHtml(initialText)
        edit.text = initialText
    }
@@ -55,7 +56,9 @@ FocusScope {
        document: edit.textDocument
        selectionStart: edit.selectionStart
        selectionEnd: edit.selectionEnd
-        onTextChanged: root.htmlEnabled ? root.text = htmlText : root.text = plainText
+        onTextChanged: {
+            root.htmlEnabled ? root.text = htmlText : root.text = plainText
+        }
        cursorPosition: edit.cursorPosition
    }
diff --git a/framework/src/domain/textdocumenthandler.cpp b/framework/src/domain/textdocumenthandler.cpp
index 6c2bc323..ea312282 100644
--- a/framework/src/domain/textdocumenthandler.cpp
+++ b/framework/src/domain/textdocumenthandler.cpp
@@ -289,3 +289,9 @@ void TextDocumentHandler::mergeFormatOnWordOrSelection(const QTextCharFormat &fo
        }
    }
 }
+bool TextDocumentHandler::isHtml(const QString &text)
+{
+    return Qt::mightBeRichText(text);
+}
diff --git a/framework/src/domain/textdocumenthandler.h b/framework/src/domain/textdocumenthandler.h
index 91cd8489..38de917d 100644
--- a/framework/src/domain/textdocumenthandler.h
+++ b/framework/src/domain/textdocumenthandler.h
@@ -88,6 +88,8 @@ public:
    Q_INVOKABLE void resetFormat();
+    Q_INVOKABLE static bool isHtml(const QString &);
 Q_SIGNALS:
    void documentChanged();
    void cursorPositionChanged();
diff --git a/views/composer/main.qml b/views/composer/main.qml
index 6c7fd581..a7f72880 100644
--- a/views/composer/main.qml
+++ b/views/composer/main.qml
@@ -76,6 +76,15 @@ ApplicationWindow {
                            cc: ["ccLoooooooooooooooooooooooooooooooooooooooooooooooooong@example.org"],
                            bcc: ["bccLoooooooooooooooooooooooooooooooooooooooooooooooooong@example.org"],
                            draft: true
+                        },
+                        {
+                            resource: "resource1",
+                            messageId: "<msg3@test.com>",
+                            date: "2017-07-23T16:46:29",
+                            subject: "HTML",
+                            body: "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'Noto Sans'; font-size:9pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">body</span></p></body></html>",
+                            to: ["html@example.org"],
+                            draft: true
                        }
                    ]
                }],
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;
+                }
            }
        }
    }