2 files changed, 16 insertions, 30 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index cf5cfd6a..423d8f34 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -62,24 +62,6 @@ Controls2.ApplicationWindow {
     }
 
     KubeAction.Action {
-        id: editAction
-        actionId: "org.kde.kube.actions.edit"
-        context: maillistcontext
-    }
-
-    KubeAction.Action {
-        id: markAsReadAction
-        actionId: "org.kde.kube.actions.mark-as-read"
-        context: maillistcontext
-    }
-
-    KubeAction.Action {
-        id: deleteAction
-        actionId: "org.kde.kube.actions.move-to-trash"
-        context: maillistcontext
-    }
-
-    KubeAction.Action {
         id: syncAction
         actionId: "org.kde.kube.actions.synchronize"
         context: folderListContext
@@ -115,6 +97,13 @@ Controls2.ApplicationWindow {
     */
     //END ActionHandler
 
+    //Controller
+    KubeFramework.MailController {
+        id: mailController
+        mail: mailListView.currentMail
+    }
+
+
     //BEGIN Shortcuts
     Shortcut {
         sequence: StandardKey.Refresh
@@ -123,8 +112,8 @@ Controls2.ApplicationWindow {
     }
     Shortcut {
         sequence: StandardKey.Delete
-        onActivated: deleteAction.execute()
-        enabled: deleteAction.ready
+        onActivated: mailController.moveToTrashAction.execute()
+        enabled: mailController.moveToTrashAction.enabled
     }
     Shortcut {
         sequence: StandardKey.MoveToNextLine
@@ -221,10 +210,10 @@ Controls2.ApplicationWindow {
                     ToolButton {
                         iconName: "mail-mark-unread"
                         text: "Mark As Read"
-                        enabled: markAsReadAction.ready
+                        enabled: mailController.markAsRead.enabled
                         tooltip: "mark mail as read"
                         onClicked: {
-                            markAsReadAction.execute()
+                            mailController.markAsRead.execute()
                         }
                     }
 
@@ -240,10 +229,10 @@ Controls2.ApplicationWindow {
                     ToolButton {
                         iconName: "edit-delete"
                         text: "Delete Mail"
-                        enabled: deleteAction.ready
+                        enabled: mailController.moveToTrashAction.enabled
                         tooltip: "delete email"
                         onClicked: {
-                            deleteAction.execute()
+                            mailController.moveToTrashAction.execute()
                         }
                     }
                 }
diff --git a/components/package/contents/ui/Outbox.qml b/components/package/contents/ui/Outbox.qml
index 5330cd4e..3a51e51a 100644
--- a/components/package/contents/ui/Outbox.qml
+++ b/components/package/contents/ui/Outbox.qml
@@ -37,11 +37,8 @@ ToolButton {
         dialog.visible = dialog.visible ? false : true
     }
 
-    KubeAction.Action {
-        id: sendNowAction
-        actionId: "org.kde.kube.actions.sendOutbox"
-        context: KubeAction.Context {
-        }
+    KubeFramework.OutboxController {
+        id: outboxController
     }
 
     //BEGIN Dialog
@@ -88,7 +85,7 @@ ToolButton {
                 height: Kirigami.Units.gridUnit * 2
                 text: qsTr("Send now.")
                 onClicked: {
-                    sendNowAction.execute()
+                    outboxController.sendOutboxAction.execute()
                 }
             }