diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift
index d3d91955a..59f5c4bf1 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift	
@@ -54,29 +54,22 @@ struct MailboxesManagementView: View {
                         .textStyle(.bodyMediumAccent)
                         .lineLimit(1)
                     Spacer()
-                    ChevronIcon(style: navigationDrawerState.showMailboxes ? .up : .down, color: .primary)
+                    if !otherMailboxes.isEmpty {
+                        ChevronIcon(style: navigationDrawerState.showMailboxes ? .up : .down, color: .primary)
+                    }
                 }
+                .environment(\.isEnabled, true)
                 .padding(.vertical, Constants.menuDrawerVerticalPadding)
                 .padding(.horizontal, Constants.menuDrawerHorizontalPadding)
                 .background(SelectionBackground(isSelected: true, offsetX: 8, leadingPadding: 0, verticalPadding: 0))
             }
+            .disabled(otherMailboxes.isEmpty)
 
             if navigationDrawerState.showMailboxes {
                 VStack(alignment: .leading, spacing: 4) {
                     ForEach(otherMailboxes) { mailbox in
                         MailboxCell(mailbox: mailbox)
                     }
-
-                    if !otherMailboxes.isEmpty {
-                        IKDivider(withPadding: true)
-                    }
-
-                    MailboxesManagementButtonView(icon: MailResourcesAsset.userSetting, text: MailResourcesStrings.Localizable.buttonManageAccount) {
-                        isShowingManageAccount.toggle()
-                    }
-                    MailboxesManagementButtonView(icon: MailResourcesAsset.userSwap, text: MailResourcesStrings.Localizable.buttonAccountSwitch) {
-                        isShowingSwitchAccount.toggle()
-                    }
                 }
                 .task {
                     try? await updateAccount()