diff --git a/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart b/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart
index b95f1d708..2dfa70149 100644
--- a/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart
@@ -11,7 +11,7 @@ class GetUserProfileSuccess extends UIState {
 }
 
 class GetUserProfileFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
 
   GetUserProfileFailure(this.exception);
 
diff --git a/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart b/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart
index ce7adb567..630d5b237 100644
--- a/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart
@@ -9,7 +9,7 @@ class RemoveEmailDraftsSuccess extends UIState {
 }
 
 class RemoveEmailDraftsFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
 
   RemoveEmailDraftsFailure(this.exception);
 
diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart
index c9a3505e4..29aba4388 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart
@@ -74,8 +74,8 @@ class MailboxDashBoardController extends ReloadableController {
 
   SearchQuery? searchQuery;
   Session? sessionCurrent;
-  Map<Role, MailboxId> mapDefaultMailboxId = Map();
-  Map<MailboxId, PresentationMailbox> mapMailbox = Map();
+  Map<Role, MailboxId> mapDefaultMailboxId = {};
+  Map<MailboxId, PresentationMailbox> mapMailbox = {};
   TextEditingController searchInputController = TextEditingController();
   FocusNode searchFocus = FocusNode();
   RouterArguments? routerArguments;
@@ -402,7 +402,7 @@ class MailboxDashBoardController extends ReloadableController {
 
   void composeEmailAction() {
     if (kIsWeb) {
-      if (dashBoardAction != DashBoardAction.compose) {
+      if (dashBoardAction.value != DashBoardAction.compose) {
         dispatchDashBoardAction(DashBoardAction.compose, arguments: ComposerArguments());
       }
     } else {
@@ -412,7 +412,7 @@ class MailboxDashBoardController extends ReloadableController {
 
   void goToComposer(ComposerArguments arguments) {
     if (kIsWeb) {
-      if (dashBoardAction != DashBoardAction.compose) {
+      if (dashBoardAction.value != DashBoardAction.compose) {
         dispatchDashBoardAction(DashBoardAction.compose, arguments: arguments);
       }
     } else {
diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart
index 7b2f437db..23e65b0db 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart
@@ -16,6 +16,8 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
 
   final _responsiveUtils = Get.find<ResponsiveUtils>();
 
+  MailboxDashBoardView({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -26,8 +28,8 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
             ? SizedBox(child: MailboxView(), width: double.infinity)
             : SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeDrawerWidthMobileTablet),
         tablet: SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeDrawerWidthMobileTablet),
-        tabletLarge: SizedBox.shrink(),
-        desktop: SizedBox.shrink()
+        tabletLarge: const SizedBox.shrink(),
+        desktop: const SizedBox.shrink()
       ),
       drawerEnableOpenDragGesture: _responsiveUtils.isMobile(context) || _responsiveUtils.isTablet(context),
       body: Stack(children: [
@@ -38,11 +40,11 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
           tablet: ThreadView(),
           mobile: ThreadView()
         ),
-        Obx(() => controller.dashBoardAction == DashBoardAction.compose
+        Obx(() => controller.dashBoardAction.value == DashBoardAction.compose
           ? ComposerView()
-          : SizedBox.shrink()),
+          : const SizedBox.shrink()),
         Obx(() => controller.isNetworkConnectionAvailable()
-          ? SizedBox.shrink()
+          ? const SizedBox.shrink()
           : Align(alignment: Alignment.bottomCenter, child: buildNetworkConnectionWidget(context))),
       ]),
     );
@@ -58,7 +60,7 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
             case AppRoutes.EMAIL:
               return EmailView();
             default:
-              return SizedBox.shrink();
+              return const SizedBox.shrink();
           }
         });
       case ReadingPane.rightOfInbox:
@@ -80,7 +82,7 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
           );
         }
       default:
-        return SizedBox.shrink();
+        return const SizedBox.shrink();
     }
   }
 
@@ -91,14 +93,12 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
       });
     }
 
-    return Container(
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeDrawerWidthMobileTablet),
-          Expanded(child: _buildThreadAndEmailContainer(context))
-        ],
-      ),
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeDrawerWidthMobileTablet),
+        Expanded(child: _buildThreadAndEmailContainer(context))
+      ],
     );
   }
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
index 51b1f2958..597da2c94 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
@@ -16,6 +16,8 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
 
   final _responsiveUtils = Get.find<ResponsiveUtils>();
 
+  MailboxDashBoardView({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -24,8 +26,8 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
           responsiveUtils: _responsiveUtils,
           mobile: SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeDrawerWidthWeb),
           tablet: SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeDrawerWidthWeb),
-          tabletLarge: SizedBox.shrink(),
-          desktop: SizedBox.shrink()
+          tabletLarge: const SizedBox.shrink(),
+          desktop: const SizedBox.shrink()
       ),
       drawerEnableOpenDragGesture: _responsiveUtils.isMobile(context) || _responsiveUtils.isTablet(context),
       body: Stack(children: [
@@ -36,11 +38,11 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
             tablet: ThreadView(),
             mobile: ThreadView()
         ),
-        Obx(() => controller.dashBoardAction == DashBoardAction.compose
+        Obx(() => controller.dashBoardAction.value == DashBoardAction.compose
             ? ComposerView()
-            : SizedBox.shrink()),
+            : const SizedBox.shrink()),
         Obx(() => controller.isNetworkConnectionAvailable()
-            ? SizedBox.shrink()
+            ? const SizedBox.shrink()
             : Align(alignment: Alignment.bottomCenter, child: buildNetworkConnectionWidget(context))),
       ]),
     );
@@ -56,7 +58,7 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
             case AppRoutes.EMAIL:
               return EmailView();
             default:
-              return SizedBox.shrink();
+              return const SizedBox.shrink();
           }
         });
       case ReadingPane.rightOfInbox:
@@ -78,7 +80,7 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
           );
         }
       default:
-        return SizedBox.shrink();
+        return const SizedBox.shrink();
     }
   }
 
@@ -89,14 +91,12 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> with Ne
       });
     }
 
-    return Container(
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeMenuWidthWeb),
-          Expanded(child: _buildThreadAndEmailContainer(context))
-        ],
-      ),
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SizedBox(child: MailboxView(), width: _responsiveUtils.defaultSizeMenuWidthWeb),
+        Expanded(child: _buildThreadAndEmailContainer(context))
+      ],
     );
   }
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/presentation/user_setting_popup_menu_mixin.dart b/lib/features/mailbox_dashboard/presentation/user_setting_popup_menu_mixin.dart
index 1ba785b5a..6f16a9b8e 100644
--- a/lib/features/mailbox_dashboard/presentation/user_setting_popup_menu_mixin.dart
+++ b/lib/features/mailbox_dashboard/presentation/user_setting_popup_menu_mixin.dart
@@ -12,7 +12,7 @@ mixin UserSettingPopupMenuMixin {
   void openUserSettingAction(BuildContext context, RelativeRect? position, List<PopupMenuEntry> popupMenuItems) async {
     await showMenu(
         context: context,
-        position: position ?? RelativeRect.fromLTRB(16, 40, 16, 16),
+        position: position ?? const RelativeRect.fromLTRB(16, 40, 16, 16),
         color: Colors.white,
         elevation: 5,
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)),
@@ -21,16 +21,16 @@ mixin UserSettingPopupMenuMixin {
 
   List<PopupMenuEntry> popupMenuUserSettingActionTile(BuildContext context, Function? onCallBack) {
     return [
-      PopupMenuItem(padding: EdgeInsets.symmetric(horizontal: 8), child: logoutAction(context, onCallBack)),
+      PopupMenuItem(padding: const EdgeInsets.symmetric(horizontal: 8), child: logoutAction(context, onCallBack)),
     ];
   }
 
   Widget logoutAction(BuildContext context, Function? onCallBack) {
     return (AppActionSheetActionBuilder(
-          Key('logout_action'),
+          const Key('logout_action'),
           SvgPicture.asset(_imagePaths.icCloseMailbox, color: AppColor.colorTextButton, fit: BoxFit.fill),
           AppLocalizations.of(context).logout,
-          iconLeftPadding:EdgeInsets.only(right: 12))
+          iconLeftPadding:const EdgeInsets.only(right: 12))
         ..onActionClick((option) => onCallBack?.call()))
       .build();
   }