2 files changed, 14 insertions, 18 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 423d8f34..bf3b4954 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -49,23 +49,11 @@ Controls2.ApplicationWindow {
         isDraft: mailListView.isDraft
     }
 
-    KubeAction.Context {
-        id: folderListContext
-        property variant folder
-        folder: folderListView.currentFolder
-    }
-
     KubeAction.Action {
         id: replyAction
         actionId: "org.kde.kube.actions.reply"
         context: maillistcontext
     }
-
-    KubeAction.Action {
-        id: syncAction
-        actionId: "org.kde.kube.actions.synchronize"
-        context: folderListContext
-    }
     //END Actions
 
     //BEGIN ActionHandler
@@ -103,12 +91,17 @@ Controls2.ApplicationWindow {
         mail: mailListView.currentMail
     }
 
+    KubeFramework.FolderController {
+        id: folderController
+        folder: folderListView.currentFolder
+    }
+
 
     //BEGIN Shortcuts
     Shortcut {
         sequence: StandardKey.Refresh
-        onActivated: syncAction.execute()
-        enabled: syncAction.ready
+        onActivated: folderController.synchronizeAction.execute()
+        enabled: folderController.synchronizeAction.enabled
     }
     Shortcut {
         sequence: StandardKey.Delete
diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index 78ec38cb..a29a290d 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -28,6 +28,10 @@ import org.kube.components 1.0 as KubeComponents
 Controls2.Button {
     id: accountSwitcher
 
+    KubeFramework.FolderController {
+        id: folderController
+    }
+
     Layout.fillWidth: true
     height: parent.height
 
@@ -87,7 +91,6 @@ Controls2.Button {
             }
 
             Controls2.Button {
-
                 anchors {
                     verticalCenter: parent.verticalCenter
                     left: parent.left
@@ -95,10 +98,10 @@ Controls2.Button {
 
                 //iconName: "view-refresh"
                 text: "Sync"
-                enabled: syncAction.ready
-
+                enabled: folderController.synchronizeAction.enabled
                 onClicked: {
-                    syncAction.execute()
+                    folderController.synchronizeAction.execute()
+                    popup.close()
                 }
             }
         }