1 files changed, 10 insertions, 0 deletions

diff --git a/components/mailviewer/qml/TextContent.qml b/components/mailviewer/qml/TextContent.qml
index 316786ef..95e196b4 100644
--- a/components/mailviewer/qml/TextContent.qml
+++ b/components/mailviewer/qml/TextContent.qml
@@ -27,8 +27,14 @@ Item {
     property bool embedded: true
     property string type
 
+    property string searchString
     property int contentHeight: textEdit.height
 
+    onSearchStringChanged: {
+        //This is a workaround because otherwise the view will not take the ViewHighlighter changes into account.
+        textEdit.text = root.content
+    }
+
     TextEdit {
         id: textEdit
 
@@ -56,5 +62,9 @@ Item {
             acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text
             cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
         }
+        Kube.ViewHighlighter {
+            textDocument: textEdit.textDocument
+            searchString: root.searchString
+        }
     }
 }