1 files changed, 1 insertions, 124 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 4d60e71b..12815e6d 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -139,131 +139,8 @@ ApplicationWindow {
                 height: parent.height
                 width: folderListView.width - 5 //to adjust for the toolbar spacing
 
-                Button {
-                    id: accountSwitcher
-
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-
-                    text: "Account Switcher"
-
-                    Rectangle {
-                        anchors {
-                            top: parent.bottom
-                            left: parent.left
-                        }
-
-                        height: 300
-                        width: 600
-
-                        color: "lightgrey" //FIXME create a propper dialog thingy
-                        clip: true
-
-                        Item {
-                            id: footer
-
-                            anchors {
-                                bottom: parent.bottom
-                                left: parent.left
-                                right: parent.right
-                                margins: Kirigami.Units.largeSpacing
-                            }
-
-                                height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 1
-                                width: listView.width
-
-                                Button {
-
-                                    anchors {
-                                        verticalCenter: parent.verticalCenter
-                                        right: parent.right
-                                    }
-
-                                    text: "Create new Account"
-                                }
-
-                                Button {
-
-                                    anchors {
-                                        verticalCenter: parent.verticalCenter
-                                        left: parent.left
-                                    }
-
-                                    iconName: "view-refresh"
-                                    text: "Sync"
-                                    enabled: syncAction.ready
-
-                                    onClicked: {
-                                        syncAction.execute()
-                                    }
-                                }
-                            }
-
-                        ListView {
-                            id: listView
-
-                            anchors {
-                                top: parent.top
-                                bottom: footer.top
-                                left: parent.left
-                                right: parent.right
-                            }
-
-                            clip: true
-
-                            model: KubeFramework.AccountsModel {  }
-
-                            delegate: Kirigami.AbstractListItem {
-                                id: accountDelegate
-
-                                enabled: true
-                                supportsMouseEvents: true
-
-                                contentItem: Item {
-                                    height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 1
-                                    width: listView.width
-
-                                    RowLayout {
-                                        anchors {
-                                            left: parent.left
-                                            margins: Kirigami.Units.smallSpacing
-                                        }
-
-                                        Layout.fillHeight: true
-
-
-                                        KubeFramework.AccountFactory {
-                                            id: accountFactory
-                                            accountId: model.accountId
-                                        }
-
-                                        Kirigami.Icon {
-                                            source: accountFactory.icon
-                                        }
-
-                                        Label {
-                                            text: model.name === "" ? accountFactory.name : model.name
-                                        }
-                                    }
-                                    Button {
-
-                                        anchors {
-                                            right: parent.right
-                                            margins: Kirigami.Units.largeSpacing
-                                        }
-
-                                        visible: accountDelegate.containsMouse
-                                        text: "edit"
-                                    }
-                                }
-                            }
-                        }
-                    }
+                KubeComponents.AccountSwitcher {
                 }
-
-                /*
-                 *
-                 */
             }
             //END Folderlist section