1 files changed, 19 insertions, 55 deletions

diff --git a/components/mailviewer/qml/MailPart.qml b/components/mailviewer/qml/MailPart.qml
index 966337cd..ad51a7ba 100644
--- a/components/mailviewer/qml/MailPart.qml
+++ b/components/mailviewer/qml/MailPart.qml
@@ -20,63 +20,27 @@ import QtQuick 2.4
 
 Item {
     id: root
+    property alias rootIndex: visualModel.rootIndex
+    property bool debug: true
+    height: partListView.height + 10
+    width: parent.width
+
+    MailDataModel {
+        id: visualModel
+        debug: root.debug
+        model: messageParser.newTree
+    }
 
-    height: partColumn.height + 40
-    width: delegateRoot.width
-
-    Column {
-        id: partColumn
-
+    ListView {
+        id: partListView
+        model: visualModel
         anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            margins: 20
-        }
-
-        spacing: 10
-
-        Repeater {
-            model: content
-
-            delegate: Column {
-                id: delegateRoot
-
-                width: partColumn.width
-
-                Loader {
-                    id: loader
-                }
-
-                Component.onCompleted: {
-
-                    switch (model.type) {
-                        case "encrypted":
-                            loader.source = "EncryptedPart.qml";
-                            break;
-                        case "embeded":
-                            loader.source = "EmbededPart.qml";
-                            break;
-                        case "frame":
-                            loader.source = "Frame.qml"
-                            break;
-                        case "plaintext":
-                            loader.source = "TextPart.qml";
-                            break;
-                        case "html":
-                            loader.source = "HtmlPart.qml";
-                        break;
-                    }
-                }
-            }
-        }
-
-
-        Item {
-            id: footer
-
-            height: 5
-            width: 10
+                top: parent.top
+                left: parent.left
+                margins: 5
         }
+        spacing: 5
+        height: contentHeight
+        width: parent.width - 10
     }
 }