diff --git a/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart b/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart
index 13490e09c..7235156d0 100644
--- a/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart
+++ b/core/lib/presentation/views/html_viewer/html_content_viewer_widget.dart
@@ -131,7 +131,8 @@ class _HtmlContentViewState extends State<HtmlContentViewer> {
       navigationDelegate: _onNavigation,
       gestureRecognizers: {
         Factory<LongPressGestureRecognizer>(() => LongPressGestureRecognizer()),
-        Factory<ScaleGestureRecognizer>(() => ScaleGestureRecognizer()),
+        if (Platform.isAndroid)
+          Factory<ScaleGestureRecognizer>(() => ScaleGestureRecognizer()),
       },
     );
   }
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index c3bb3f567..00f804c8c 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -127,9 +127,7 @@ class EmailView extends GetWidget<EmailController> with NetworkConnectionMixin {
       padding: const EdgeInsets.only(top: 6),
       child: AppBarMailWidgetBuilder(
         controller.currentEmail,
-        currentMailbox: controller.currentEmail != null
-          ? controller.getMailboxContain(controller.currentEmail!)
-          : null,
+        currentMailbox: controller.mailboxDashBoardController.selectedMailbox.value,
         isSearchIsRunning: controller.mailboxDashBoardController.searchController.isSearchEmailRunning,
         onBackActionClick: () => controller.closeEmailView(context),
         onEmailActionClick: (email, action) =>
diff --git a/lib/features/email/presentation/widgets/app_bar_mail_widget_builder.dart b/lib/features/email/presentation/widgets/app_bar_mail_widget_builder.dart
index bdc6500ae..2a3d44da4 100644
--- a/lib/features/email/presentation/widgets/app_bar_mail_widget_builder.dart
+++ b/lib/features/email/presentation/widgets/app_bar_mail_widget_builder.dart
@@ -48,7 +48,9 @@ class AppBarMailWidgetBuilder extends StatelessWidget {
               onTap: () => onBackActionClick?.call(),
               borderRadius: BorderRadius.circular(15),
               child: Tooltip(
-                message: AppLocalizations.of(context).back,
+                message: isSearchIsRunning
+                    ? AppLocalizations.of(context).backToSearchResults
+                    : AppLocalizations.of(context).back,
                 child: Container(
                   color: Colors.transparent,
                   height: 40,
@@ -60,17 +62,18 @@ class AppBarMailWidgetBuilder extends StatelessWidget {
                         height: 18,
                         color: AppColor.colorTextButton,
                         fit: BoxFit.fill),
-                    Container(
-                      margin: const EdgeInsets.only(left: 8),
-                      constraints: BoxConstraints(
-                          maxWidth: _responsiveUtils.getSizeScreenWidth(context) - 250),
-                      child: Text(
-                          currentMailbox?.name?.name.capitalizeFirstEach ?? '',
-                          maxLines: 1,
-                          overflow: CommonTextStyle.defaultTextOverFlow,
-                          softWrap: CommonTextStyle.defaultSoftWrap,
-                          style: const TextStyle(fontSize: 17, color: AppColor.colorTextButton)),
-                    ),
+                    if (!isSearchIsRunning)
+                      Container(
+                        margin: const EdgeInsets.only(left: 8),
+                        constraints: BoxConstraints(
+                            maxWidth: _responsiveUtils.getSizeScreenWidth(context) - 250),
+                        child: Text(
+                            currentMailbox?.name?.name.capitalizeFirstEach ?? '',
+                            maxLines: 1,
+                            overflow: CommonTextStyle.defaultTextOverFlow,
+                            softWrap: CommonTextStyle.defaultSoftWrap,
+                            style: const TextStyle(fontSize: 17, color: AppColor.colorTextButton)),
+                      ),
                   ]),
                 ),
               ),
diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb
index a35619cdb..30295978a 100644
--- a/lib/l10n/intl_messages.arb
+++ b/lib/l10n/intl_messages.arb
@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2022-09-12T10:15:14.832674",
+  "@@last_modified": "2022-09-16T10:29:51.348820",
   "initializing_data": "Initializing data...",
   "@initializing_data": {
     "type": "text",
@@ -2173,5 +2173,11 @@
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
+  },
+  "backToSearchResults": "Back to Search Results",
+  "@backToSearchResults": {
+    "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
   }
 }
\ No newline at end of file
diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart
index 92fe7a723..eae873a52 100644
--- a/lib/main/localizations/app_localizations.dart
+++ b/lib/main/localizations/app_localizations.dart
@@ -2244,4 +2244,12 @@ class AppLocalizations {
       name: 'vacationSetting',
     );
   }
+
+  String get backToSearchResults {
+    return Intl.message(
+      'Back to Search Results',
+      name: 'backToSearchResults',
+    );
+  }
+
 }
\ No newline at end of file