diff --git a/lib/features/mailbox/presentation/mailbox_view.dart b/lib/features/mailbox/presentation/mailbox_view.dart
index bfa8db8c1..1ee77eb7c 100644
--- a/lib/features/mailbox/presentation/mailbox_view.dart
+++ b/lib/features/mailbox/presentation/mailbox_view.dart
@@ -58,15 +58,13 @@ class MailboxView extends GetWidget<MailboxController> {
                               child: RefreshIndicator(
                                 color: AppColor.primaryColor,
                                 onRefresh: () async => controller.refreshAllMailbox(),
-                                child: SafeArea(top: false, right: false,
-                                  bottom: !controller.isSelectionEnabled(),
+                                child: SafeArea(
+                                  top: false,
+                                  right: false,
+                                  bottom: false,
                                   child: controller.isSearchActive()
                                       ? _buildListMailboxSearched(context)
-                                      : Padding(
-                                          padding: EdgeInsets.only(
-                                              bottom: _responsiveUtils.isLandscapeMobile(context)
-                                                  || controller.isSelectionEnabled() ? 0 : 24),
-                                          child: _buildListMailbox(context))
+                                      : _buildListMailbox(context)
                                 )
                               ),
                             ))),
@@ -75,8 +73,10 @@ class MailboxView extends GetWidget<MailboxController> {
                                 : const SizedBox.shrink()),
                           ]),
                         ),
-                        Obx(() => controller.isMailboxListScrollable.isTrue && !controller.isSelectionEnabled()
-                            ? const QuotasFooterWidget(padding: EdgeInsets.only(left: 24, right: 24, bottom: 8))
+                        Obx(() => controller.isMailboxListScrollable.isTrue
+                          && !controller.isSearchActive()
+                          && !controller.isSelectionEnabled()
+                            ? const QuotasFooterWidget()
                             : const SizedBox.shrink(),
                         ),
                         Obx(() {
@@ -87,9 +87,7 @@ class MailboxView extends GetWidget<MailboxController> {
                             if (_responsiveUtils.isLandscapeMobile(context)) {
                               return const SizedBox.shrink();
                             }
-                            return Align(
-                                alignment: Alignment.bottomCenter,
-                                child: _buildVersionInformation(context, appInformation));
+                            return _buildVersionInformation(context, appInformation);
                           } else {
                             return const SizedBox.shrink();
                           }
@@ -225,7 +223,7 @@ class MailboxView extends GetWidget<MailboxController> {
         controller: controller.mailboxListScrollController,
         key: const PageStorageKey('mailbox_list'),
         physics: const ClampingScrollPhysics(),
-        padding: EdgeInsets.only(bottom: controller.isSelectionEnabled() ? 16 : 0),
+        padding: const EdgeInsets.only(bottom: 16),
         child: Column(children: [
           Obx(() {
             if (controller.isSelectionEnabled() && _responsiveUtils.isLandscapeMobile(context)) {
@@ -242,8 +240,10 @@ class MailboxView extends GetWidget<MailboxController> {
           Obx(() => controller.folderMailboxTree.value.root.childrenItems?.isNotEmpty ?? false
               ? _buildMailboxCategory(context, MailboxCategories.folders, controller.folderMailboxTree.value.root)
               : const SizedBox.shrink()),
-          Obx(() => controller.isMailboxListScrollable.isFalse && !controller.isSelectionEnabled()
-              ? const QuotasFooterWidget(padding: EdgeInsets.only(left: 24, right: 24, bottom: 8, top: 8))
+          Obx(() => controller.isMailboxListScrollable.isFalse
+            && !controller.isSearchActive()
+            && !controller.isSelectionEnabled()
+              ? const QuotasFooterWidget()
               : const SizedBox.shrink(),
           ),
         ])
diff --git a/lib/features/quotas/presentation/widget/quotas_footer_widget.dart b/lib/features/quotas/presentation/widget/quotas_footer_widget.dart
index f62b2d854..0755b93a4 100644
--- a/lib/features/quotas/presentation/widget/quotas_footer_widget.dart
+++ b/lib/features/quotas/presentation/widget/quotas_footer_widget.dart
@@ -7,15 +7,21 @@ import 'package:tmail_ui_user/features/quotas/presentation/quotas_controller.dar
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
 class QuotasFooterWidget extends GetWidget<QuotasController> {
-  const QuotasFooterWidget({Key? key, this.padding}) : super(key: key);
-  final EdgeInsetsGeometry? padding;
+
+  const QuotasFooterWidget({
+    Key? key,
+    this.padding
+  }) : super(key: key);
+
+  final EdgeInsets? padding;
+
   @override
   Widget build(BuildContext context) {
     return Obx(
       () => controller.quotasState.value != QuotasState.notAvailable
         ? Container(
             color: AppColor.colorBgDesktop,
-            padding: padding ?? const EdgeInsets.all(24),
+            padding: padding ?? const EdgeInsets.symmetric(vertical: 12, horizontal: 24),
             alignment: Alignment.centerLeft,
             child: IntrinsicWidth(
               child: Column(