4 files changed, 43 insertions, 27 deletions

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index 46427194..0f64972c 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -21,8 +21,7 @@ import QtQml.Models 2.2
 import org.kube.framework 1.0 as Kube
 
 DelegateModel {
-    id: mailDataModel
-    property bool debug: true
+    id: root
 
     delegate: Item {
         id: partColumn
@@ -65,13 +64,13 @@ DelegateModel {
                     partLoader.setSource("TextContent.qml",
                                         {"content": model.content,
                                         "embedded": model.embeded,
-                                        "type": model.type,
-                                        "debug": debug})
+                                        "type": model.type
+                                        })
                     break
                 case "html":
                     partLoader.setSource("HtmlContent.qml",
                                         {"content": model.content,
-                                        "debug": debug})
+                                        })
                     break;
                 case "error":
                     partLoader.setSource("ErrorPart.qml",
@@ -80,11 +79,13 @@ DelegateModel {
                                         "errorString": model.errorString,
                                         })
                     break;
-                case "envelope":
+                case "encapsulated":
                     partLoader.setSource("MailPart.qml",
-                                        {"rootIndex": mailDataModel.modelIndex(index),
-                                        "model": mailDataModel.model,
-                                        "debug": debug})
+                                        {"rootIndex": root.modelIndex(index),
+                                        "model": root.model,
+                                        "sender": model.sender,
+                                        "date": model.date
+                                        })
                     break;
             }
         }
diff --git a/components/mailviewer/contents/ui/MailPart.qml b/components/mailviewer/contents/ui/MailPart.qml
index bf534e85..7ff426e9 100644
--- a/components/mailviewer/contents/ui/MailPart.qml
+++ b/components/mailviewer/contents/ui/MailPart.qml
@@ -18,29 +18,54 @@
 
 import QtQuick 2.4
 
+import org.kube.framework 1.0 as Kube
+
 Item {
     id: root
     property alias rootIndex: visualModel.rootIndex
     property alias model: visualModel.model
-    property alias debug: visualModel.debug
-    height: partListView.height + 10
-    width: parent.width
+    property variant sender
+    property variant date
+    height: childrenRect.height
 
     MailDataModel {
         id: visualModel
     }
 
+    Rectangle {
+        id: border
+        anchors {
+            top: parent.top
+            left: parent.left
+            leftMargin: Kube.Units.smallSpacing
+        }
+        color: "lightgrey"
+        height: partListView.height
+        width: Kube.Units.smallSpacing
+    }
+
+    Text {
+        id: sender
+        anchors {
+            left: border.right
+            leftMargin: Kube.Units.smallSpacing
+        }
+
+        text: "sent by " + root.sender + " on  " + root.date
+        color: "grey"
+    }
     ListView {
         id: partListView
         model: visualModel
         anchors {
-                top: parent.top
-                left: parent.left
-                margins: 5
+            top: sender.bottom
+            left: border.right
+            margins: Kube.Units.smallSpacing
+            leftMargin: Kube.Units.smallSpacing
         }
-        spacing: 5
+        spacing: 7
         height: contentHeight
-        width: parent.width - 10
+        width: parent.width - Kube.Units.smallSpacing * 3
         interactive: false
     }
 }
diff --git a/components/mailviewer/contents/ui/MailViewer.qml b/components/mailviewer/contents/ui/MailViewer.qml
index 23307009..9031ec17 100644
--- a/components/mailviewer/contents/ui/MailViewer.qml
+++ b/components/mailviewer/contents/ui/MailViewer.qml
@@ -22,7 +22,6 @@ Item {
     id: root
     property alias rootIndex: visualModel.rootIndex
     property alias model: visualModel.model
-    property alias debug: visualModel.debug
     height: partListView.height
 
     MailDataModel {
diff --git a/components/mailviewer/contents/ui/TextContent.qml b/components/mailviewer/contents/ui/TextContent.qml
index f8ef7f9a..a0094a3e 100644
--- a/components/mailviewer/contents/ui/TextContent.qml
+++ b/components/mailviewer/contents/ui/TextContent.qml
@@ -24,7 +24,6 @@ Item {
     id: root
 
     property string content
-    property bool debug: true
     property bool embedded: true
     property string type
 
@@ -54,13 +53,5 @@ Item {
             color: embedded ? Kube.Colors.disabledTextColor : Kube.Colors.textColor
             onLinkActivated: Qt.openUrlExternally(link)
         }
-
-        //BEGIN debug
-        Text {
-            width: parent.width
-            visible: root.debug
-            text: type
-        }
-        //END debug
     }
 }