diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift
index 43da10ac6..793d3de0f 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxCell.swift	
@@ -63,9 +63,14 @@ struct MailboxCell: View {
             icon: MailResourcesAsset.envelope,
             text: mailbox.email,
             detailNumber: detailNumber,
-            isSelected: isSelected
+            isSelected: isSelected,
+            isPasswordValid: mailbox.isPasswordValid
         ) {
             guard !isSelected else { return }
+            guard mailbox.isPasswordValid else {
+                IKSnackBar.showSnackBar(message: MailResourcesStrings.Localizable.frelatedMailbox)
+                return
+            }
             @InjectService var matomo: MatomoUtils
             switch style {
             case .menuDrawer:
diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift
index bd6a07053..b39ba8727 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
@@ -29,18 +29,21 @@ struct MailboxesManagementButtonView: View {
     let detailNumber: Int?
     let handleAction: () -> Void
     let isSelected: Bool
+    let isPasswordValid: Bool
 
     init(
         icon: MailResourcesImages,
         text: String,
         detailNumber: Int? = nil,
         isSelected: Bool,
+        isPasswordValid: Bool,
         handleAction: @escaping () -> Void
     ) {
         self.icon = icon.swiftUIImage
         self.text = text
         self.detailNumber = detailNumber
         self.isSelected = isSelected
+        self.isPasswordValid = isPasswordValid
         self.handleAction = handleAction
     }
 
@@ -59,17 +62,21 @@ struct MailboxesManagementButtonView: View {
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
 
-                switch style {
-                case .menuDrawer:
-                    if let detailNumber {
-                        Text(detailNumber < 100 ? "\(detailNumber)" : "99+")
-                            .textStyle(.bodySmallMediumAccent)
-                    }
-                case .account:
-                    if isSelected {
-                        MailResourcesAsset.check.swiftUIImage
-                            .frame(width: 16, height: 16)
-                            .foregroundColor(.accentColor)
+                if !isPasswordValid {
+                    MailResourcesAsset.warning.swiftUIImage
+                } else {
+                    switch style {
+                    case .menuDrawer:
+                        if let detailNumber {
+                            Text(detailNumber < 100 ? "\(detailNumber)" : "99+")
+                                .textStyle(.bodySmallMediumAccent)
+                        }
+                    case .account:
+                        if isSelected {
+                            MailResourcesAsset.check.swiftUIImage
+                                .frame(width: 16, height: 16)
+                                .foregroundColor(.accentColor)
+                        }
                     }
                 }
             }
@@ -80,14 +87,15 @@ struct MailboxesManagementButtonView: View {
 
 struct MailboxesManagementButtonView_Previews: PreviewProvider {
     static var previews: some View {
-        MailboxesManagementButtonView(icon: MailResourcesAsset.folder, text: "Hello", isSelected: false) {
+        MailboxesManagementButtonView(icon: MailResourcesAsset.folder, text: "Hello", isSelected: false, isPasswordValid: true) {
             /* Empty for test */
         }
         MailboxesManagementButtonView(
             icon: MailResourcesAsset.folder,
             text: "Hello",
             detailNumber: 10,
-            isSelected: false
+            isSelected: false,
+            isPasswordValid: true
         ) {
             /* Empty for test */
         }
diff --git a/MailResources/Assets.xcassets/warning.imageset/Contents.json b/MailResources/Assets.xcassets/warning.imageset/Contents.json
new file mode 100644
index 000000000..b3f623cd6
--- /dev/null
+++ b/MailResources/Assets.xcassets/warning.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "warning.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "original"
+  }
+}
diff --git a/MailResources/Assets.xcassets/warning.imageset/warning.svg b/MailResources/Assets.xcassets/warning.imageset/warning.svg
new file mode 100644
index 000000000..81309f4b5
--- /dev/null
+++ b/MailResources/Assets.xcassets/warning.imageset/warning.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.54069 16H14.5281C14.7959 16 15.0637 15.9333 15.2645 15.7998C15.4654 15.6663 15.6662 15.4661 15.8001 15.2659C15.934 15.0657 16.0009 14.7987 16.0009 14.5318C16.0009 14.2649 16.0009 13.9979 15.8671 13.7977L9.50722 0.917623C9.37333 0.650678 9.17249 0.450469 8.90471 0.250261C8.36915 -0.0834202 7.63275 -0.0834202 7.09718 0.250261C6.8294 0.383733 6.62856 0.650678 6.49467 0.917623L0.134837 13.7977C0.0678916 13.9979 0.000946045 14.2649 0.000946045 14.5318C0.000946045 14.7987 0.0678916 15.0657 0.268728 15.2659C0.40262 15.4661 0.603456 15.6663 0.804293 15.7998C1.00513 15.9333 1.27291 16 1.54069 16ZM7.58427 12.1264C7.70761 12.044 7.85261 12 8.00095 12C8.19986 12 8.39062 12.079 8.53128 12.2197C8.67193 12.3603 8.75095 12.5511 8.75095 12.75C8.75095 12.8983 8.70696 13.0433 8.62455 13.1667C8.54214 13.29 8.425 13.3861 8.28796 13.4429C8.15091 13.4997 8.00011 13.5145 7.85463 13.4856C7.70915 13.4566 7.57551 13.3852 7.47062 13.2803C7.36572 13.1754 7.2943 13.0418 7.26536 12.8963C7.23642 12.7508 7.25127 12.6 7.30804 12.463C7.3648 12.3259 7.46093 12.2088 7.58427 12.1264ZM8.50095 5.49999C8.50095 5.22385 8.27709 4.99999 8.00095 4.99999C7.7248 4.99999 7.50095 5.22385 7.50095 5.49999V10.5C7.50095 10.7761 7.7248 11 8.00095 11C8.27709 11 8.50095 10.7761 8.50095 10.5V5.49999Z" fill="#FF8500"/>
+</svg>
diff --git a/MailResources/Localizable/de.lproj/Localizable.strings b/MailResources/Localizable/de.lproj/Localizable.strings
index 809a09ac2..ed9474e88 100644
Binary files a/MailResources/Localizable/de.lproj/Localizable.strings and b/MailResources/Localizable/de.lproj/Localizable.strings differ
diff --git a/MailResources/Localizable/en.lproj/Localizable.strings b/MailResources/Localizable/en.lproj/Localizable.strings
index c997e6a8b..2e65a7a0a 100644
Binary files a/MailResources/Localizable/en.lproj/Localizable.strings and b/MailResources/Localizable/en.lproj/Localizable.strings differ
diff --git a/MailResources/Localizable/es.lproj/Localizable.strings b/MailResources/Localizable/es.lproj/Localizable.strings
index 5d3e0ce17..daa771ea5 100644
Binary files a/MailResources/Localizable/es.lproj/Localizable.strings and b/MailResources/Localizable/es.lproj/Localizable.strings differ
diff --git a/MailResources/Localizable/fr.lproj/Localizable.strings b/MailResources/Localizable/fr.lproj/Localizable.strings
index 69dc7d135..8d270f586 100644
Binary files a/MailResources/Localizable/fr.lproj/Localizable.strings and b/MailResources/Localizable/fr.lproj/Localizable.strings differ
diff --git a/MailResources/Localizable/it.lproj/Localizable.strings b/MailResources/Localizable/it.lproj/Localizable.strings
index c2470d148..54247611b 100644
Binary files a/MailResources/Localizable/it.lproj/Localizable.strings and b/MailResources/Localizable/it.lproj/Localizable.strings differ