2 files changed, 21 insertions, 7 deletions

diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml
index d04d1d92..1fa3aab2 100644
--- a/framework/qml/Icons.qml
+++ b/framework/qml/Icons.qml
@@ -35,8 +35,9 @@ Item {
 
     property string markAsRead: "mail-mark-read-inverted"
     property string markAsUnread: "mail-mark-unread-new-inverted"
-    property string markImportant: "kubeimportant"
+    property string markImportant: "kubeimportant-inverted"
     property string markUnimportant: "kubeunimportant"
+    property string isImportant: "kubeimportant"
     property string undo: "edit-undo-inverted"
     property string moveToTrash: "kubetrash"
     property string edit: "document-edit"
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 998d9729..ee4f4957 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -208,25 +208,38 @@ FocusScope {
 
                     Kube.Label {
                         id: threadCounter
-                        anchors.right: parent.right
+                        anchors {
+                            right: parent.right
+                            margins: Kube.Units.smallSpacing
+                        }
                         text: model.threadSize
                         color: content.unreadColor
-                        visible: model.threadSize > 1
+                        visible: model.threadSize > 1 &&  !delegateRoot.focused
+
                     }
                 }
 
-                Row {
+                Kube.Icon {
+                        anchors {
+                            right: parent.right
+                            verticalCenter: parent.verticalCenter
+                            margins: Kube.Units.smallSpacing
+                        }
+
+                        visible:  model.important && !delegateRoot.focused && !mouseArea.drag.active
+                        iconName: Kube.Icons.isImportant
+                }
+
+                Column {
                     id: buttons
 
                     anchors {
                         right: parent.right
-                        bottom: parent.bottom
                         margins: Kube.Units.smallSpacing
+                        verticalCenter: parent.verticalCenter
                     }
 
                     visible: delegateRoot.focused && !mouseArea.drag.active
-
-                    spacing: Kube.Units.smallSpacing
                     opacity: 0.7
 
                     Kube.IconButton {