2 files changed, 9 insertions, 10 deletions

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index 029e8707..ec7f8e74 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -71,7 +71,7 @@ DelegateModel {
 
         Column {
             id: buttons
-            anchors.right: parent.left
+            anchors.left: parent.left
             anchors.top: parent.top
             anchors.rightMargin: Kube.Units.smallSpacing
             spacing: Kube.Units.smallSpacing
@@ -107,8 +107,7 @@ DelegateModel {
             anchors.topMargin: Kube.Units.smallSpacing
             anchors.top: buttons.bottom
             anchors.bottom: partLoader.bottom
-            anchors.right: parent.left
-            anchors.rightMargin: Kube.Units.smallSpacing
+            anchors.right: buttons.right
             width: Kube.Units.smallSpacing
             color: getColor(model.securityLevel)
             opacity: 0.5
@@ -118,7 +117,8 @@ DelegateModel {
             id: partLoader
             anchors {
                 top: parent.top
-                left: parent.left
+                left: buttons.right
+                leftMargin: Kube.Units.smallSpacing
                 right: parent.right
             }
             height: item ? item.contentHeight : 0
diff --git a/components/mailviewer/contents/ui/MailPart.qml b/components/mailviewer/contents/ui/MailPart.qml
index 4fa2bd73..e570ebaa 100644
--- a/components/mailviewer/contents/ui/MailPart.qml
+++ b/components/mailviewer/contents/ui/MailPart.qml
@@ -28,10 +28,6 @@ Item {
     property variant date
     height: childrenRect.height
 
-    MailDataModel {
-        id: visualModel
-    }
-
     Rectangle {
         id: border
         anchors {
@@ -40,13 +36,14 @@ Item {
             leftMargin: Kube.Units.smallSpacing
         }
         color: Kube.Colors.lightgrey
-        height: partListView.height
+        height: partListView.height + sender.height
         width: Kube.Units.smallSpacing
     }
 
     Text {
         id: sender
         anchors {
+            top: parent.top
             left: border.right
             leftMargin: Kube.Units.smallSpacing
         }
@@ -56,13 +53,15 @@ Item {
     }
     ListView {
         id: partListView
-        model: visualModel
         anchors {
             top: sender.bottom
             left: border.right
             margins: Kube.Units.smallSpacing
             leftMargin: Kube.Units.smallSpacing
         }
+        model: MailDataModel {
+            id: visualModel
+        }
         spacing: 7
         height: contentHeight
         width: parent.width - Kube.Units.smallSpacing * 3