diff --git a/ui/app/AppLayouts/Node/NodeLayout.qml b/ui/app/AppLayouts/Node/NodeLayout.qml
index d44c7d74db..aade9a2479 100644
--- a/ui/app/AppLayouts/Node/NodeLayout.qml
+++ b/ui/app/AppLayouts/Node/NodeLayout.qml
@@ -76,37 +76,6 @@ Item {
             }
         }
 
-        RowLayout {
-            Layout.fillWidth: true
-            StatusBaseText {
-                color: Theme.palette.primaryColor1
-                text: qsTr("Active Mailserver")
-                Layout.rightMargin: Style.current.padding
-                Layout.leftMargin: Style.current.padding
-                Layout.fillWidth: true
-                font.weight: Font.Medium
-                font.pixelSize: 20
-            }
-            StatusBaseText {
-                id: activeMailserverTxt
-                color: Theme.palette.directColor1
-                text: "..."
-                Layout.rightMargin: Style.current.padding
-                Layout.leftMargin: Style.current.padding
-                Layout.fillWidth: true
-                wrapMode: Text.Wrap
-                font.weight: Font.Medium
-                font.pixelSize: 14
-            }
-        }
-
-        Connections {
-            target: root.store.profileModelInst.mailservers
-            onActiveMailserverChanged: (activeMailserver) => {
-                activeMailserverTxt.text = root.store.getMailserverName(activeMailserver) + "\n" + activeMailserver
-            }
-        }
-
         ColumnLayout {
             id: mailserverLogsContainer
             height: 300
diff --git a/ui/app/AppLayouts/Profile/views/SyncView.qml b/ui/app/AppLayouts/Profile/views/SyncView.qml
index b053768f52..c3be9deb9e 100644
--- a/ui/app/AppLayouts/Profile/views/SyncView.qml
+++ b/ui/app/AppLayouts/Profile/views/SyncView.qml
@@ -20,8 +20,9 @@ Item {
 
     Connections {
         target: root.store.mailservers
-        onActiveMailserverChanged: (activeMailserver) => {
-            root.activeMailserver = root.store.getMailserverName(activeMailserver)
+        onActiveMailserverChanged: function(activeMailserverName){
+            var mName = root.store.getMailserverName(activeMailserverName)
+            root.activeMailserver = mName
         }
     }
 
@@ -174,7 +175,7 @@ Item {
 
         StatusBaseText {
             //% "..."
-            text: qsTr("Active mailserver: %1").arg(activeMailserver) || qsTrId("---")
+            text: qsTr("Active mailserver: %1").arg(activeMailserver || qsTrId("---"))
             anchors.left: parent.left
             anchors.leftMargin: 24
             anchors.top: switchLbl.bottom