1 files changed, 34 insertions, 20 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 88aabf7e..8ee1c794 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -1,20 +1,20 @@
 /*
-  Copyright (C) 2015 Michael Bohlender, <michael.bohlender@kdemail.net>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
+ *  Copyright (C) 2017 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 
 import QtQuick 2.7
@@ -152,7 +152,9 @@ Controls2.ApplicationWindow {
 
                     spacing: Kirigami.Units.largeSpacing
 
-                    ToolButton {
+                    KubeComponents.AccountSwitcher {
+                        id: accountSwitcher
+
                         iconName: "kdenlive-menu"
                         height: Kirigami.Units.gridUnit * 1.5
                         width: height
@@ -212,8 +214,8 @@ Controls2.ApplicationWindow {
                 }
             }
 
-            KubeComponents.AccountSwitcher {
-                id: accountSwitcher
+            Item {
+                id: accountName
 
                 anchors {
                     top: newMailButton.bottom
@@ -222,13 +224,25 @@ Controls2.ApplicationWindow {
 
                 width: parent.width
                 height: Kirigami.Units.gridUnit * 2
+
+                Text {
+                    anchors {
+                        bottom: parent.bottom
+                        left: parent.left
+                        leftMargin: Kirigami.Units.smallSpacing
+                    }
+
+                    text: accountSwitcher.accountName
+                    font.weight: Font.DemiBold
+                    color: "white"
+                }
             }
 
             KubeComponents.FolderListView {
                 id: folderListView
 
                 anchors {
-                    top: accountSwitcher.bottom
+                    top: accountName.bottom
                     topMargin: Kirigami.Units.smallSpacing
                     bottom: parent.bottom
                     left: parent.left