diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index f5e0e61e3..ec0130c1e 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -320,7 +320,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         mailToClicked: openMailToLink,
         downloadAttachmentClicked: () {
           if (currentContext == null || attachments.isEmpty) return;
-          handleDownloadAttachmentAction(currentContext!, success.attachment);
+          handleDownloadAttachmentAction(success.attachment);
         },
         responsiveUtils: responsiveUtils,
       ));
@@ -904,36 +904,53 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     }
   }
 
-  void exportAttachment(BuildContext context, Attachment attachment) {
+  void exportAttachment(Attachment attachment) {
     final cancelToken = CancelToken();
-    _showDownloadingFileDialog(context, attachment.name ?? '', cancelToken: cancelToken);
+    _showDownloadingFileDialog(attachment.name ?? '', cancelToken: cancelToken);
     _exportAttachmentAction(attachment, cancelToken);
   }
 
-  void _showDownloadingFileDialog(BuildContext context, String attachmentName, {CancelToken? cancelToken}) {
+  void _showDownloadingFileDialog(String attachmentName, {CancelToken? cancelToken}) {
     if (cancelToken != null) {
-      showCupertinoDialog(
-          context: context,
-          builder: (_) =>
-              PointerInterceptor(child: (DownloadingFileDialogBuilder()
+      Get.dialog(
+        PointerInterceptor(
+          child: Builder(
+            builder: (context) {
+              final appLocalizations = AppLocalizations.of(context);
+              return (DownloadingFileDialogBuilder()
                     ..key(const Key('downloading_file_dialog'))
-                    ..title(AppLocalizations.of(context).preparing_to_export)
-                    ..content(AppLocalizations.of(context).downloading_file(attachmentName))
-                    ..actionText(AppLocalizations.of(context).cancel)
+                    ..title(appLocalizations.preparing_to_export)
+                    ..content(appLocalizations.downloading_file(attachmentName))
+                    ..actionText(appLocalizations.cancel)
                     ..addCancelDownloadActionClick(() {
-                      cancelToken.cancel([AppLocalizations.of(context).user_cancel_download_file]);
+                      cancelToken.cancel([
+                        appLocalizations.user_cancel_download_file,
+                      ]);
                       popBack();
                     }))
-                .build()));
+                  .build();
+            },
+          ),
+        ),
+        barrierDismissible: false,
+      );
     } else {
-      showCupertinoDialog(
-          context: context,
-          builder: (_) =>
-              PointerInterceptor(child: (DownloadingFileDialogBuilder()
-                  ..key(const Key('downloading_file_for_web_dialog'))
-                  ..title(AppLocalizations.of(context).preparing_to_save)
-                  ..content(AppLocalizations.of(context).downloading_file(attachmentName)))
-                .build()));
+      Get.dialog(
+        PointerInterceptor(
+          child: Builder(
+            builder: (context) {
+              final appLocalizations = AppLocalizations.of(context);
+              return (DownloadingFileDialogBuilder()
+                    ..key(const Key('downloading_file_for_web_dialog'))
+                    ..title(appLocalizations.preparing_to_save)
+                    ..content(
+                      appLocalizations.downloading_file(attachmentName),
+                    ))
+                  .build();
+            },
+          ),
+        ),
+      );
     }
   }
 
@@ -956,9 +973,9 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     }
   }
 
-  void exportAllAttachments(BuildContext context, String outputFileName) {
+  void exportAllAttachments(String outputFileName) {
     final cancelToken = CancelToken();
-    _showDownloadingFileDialog(context, outputFileName, cancelToken: cancelToken);
+    _showDownloadingFileDialog(outputFileName, cancelToken: cancelToken);
     _exportAllAttachmentsAction(outputFileName, cancelToken);
   }
 
@@ -988,7 +1005,9 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
 
   void _exportAttachmentFailureAction(ExportAttachmentFailure failure) {
     if (failure.exception is! CancelDownloadFileException) {
-      popBack();
+      if (Get.isDialogOpen == true) {
+        popBack();
+      }
 
       if (currentOverlayContext != null && currentContext != null) {
         appToast.showToastErrorMessage(
@@ -1164,9 +1183,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
             onClose: () => Navigator.maybePop(context),
             onDownload: currentContext == null
               ? null
-              : () => handleDownloadAttachmentAction(
-                  currentContext!,
-                  success.attachment),
+              : () => handleDownloadAttachmentAction(success.attachment),
           ),
         )),
         barrierDismissible: false,
@@ -1186,9 +1203,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
             onClose: () => Navigator.maybePop(context),
             onDownload: currentContext == null
               ? null
-              : () => handleDownloadAttachmentAction(
-                  currentContext!,
-                  success.attachment),
+              : () => handleDownloadAttachmentAction(success.attachment),
           ),
         )),
         barrierDismissible: false,
@@ -1756,7 +1771,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     if (responsiveUtils.isMobile(context)) {
       (AttachmentListBottomSheetBuilder(context, attachments, imagePaths, _attachmentListScrollController, tag)
         ..onCloseButtonAction(() => popBack())
-        ..onDownloadAttachmentFileAction((attachment) => handleDownloadAttachmentAction(context, attachment))
+        ..onDownloadAttachmentFileAction((attachment) => handleDownloadAttachmentAction(attachment))
         ..onViewAttachmentFileAction((attachment) => handleViewAttachmentAction(context, attachment))
         ..onDownloadAllButtonAction(isDownloadAllSupported()
           ? () => downloadAllAttachmentsForWeb('TwakeMail-${DateTime.now()}')
@@ -1773,7 +1788,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
             scrollController: _attachmentListScrollController,
             backgroundColor: Colors.black.withAlpha(24),
             onCloseButtonAction: () => popBack(),
-            onDownloadAttachmentFileAction: (attachment) => handleDownloadAttachmentAction(context, attachment),
+            onDownloadAttachmentFileAction: (attachment) => handleDownloadAttachmentAction(attachment),
             onViewAttachmentFileAction: (attachment) => handleViewAttachmentAction(context, attachment),
             onDownloadAllButtonAction: isDownloadAllSupported()
               ? () => downloadAllAttachmentsForWeb('TwakeMail-${DateTime.now()}')
@@ -2014,27 +2029,23 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
   }
 
   void handleDownloadAttachmentAction(
-    BuildContext context,
     Attachment attachment,
     {bool previewerSupported = false}
   ) {
     if (PlatformInfo.isWeb) {
       downloadAttachmentForWeb(attachment, previewerSupported: previewerSupported);
     } else if (PlatformInfo.isMobile) {
-      exportAttachment(context, attachment);
+      exportAttachment(attachment);
     } else {
       log('EmailView::handleDownloadAttachmentAction: THE PLATFORM IS SUPPORTED');
     }
   }
 
-  void handleDownloadAllAttachmentsAction(
-    BuildContext context,
-    String outputFileName,
-  ) {
+  void handleDownloadAllAttachmentsAction(String outputFileName) {
     if (PlatformInfo.isWeb) {
       downloadAllAttachmentsForWeb(outputFileName);
     } else if (PlatformInfo.isMobile) {
-      exportAllAttachments(context, outputFileName);
+      exportAllAttachments(outputFileName);
     } else {
       log('EmailView::handleDownloadAllAttachmentsAction: THE PLATFORM IS SUPPORTED');
     }
@@ -2067,7 +2078,6 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
       ));
     } else {
       handleDownloadAttachmentAction(
-        context,
         attachment,
         previewerSupported: attachmentPreviewSupported(attachment),
       );
@@ -2273,7 +2283,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
             onMailtoDelegateAction: openMailToLink,
             onPreviewEMLDelegateAction: (uri) => _openEMLPreviewer(context, uri),
             onDownloadAttachmentDelegateAction: (uri) =>
-                _downloadAttachmentInEMLPreview(context, uri),
+                _downloadAttachmentInEMLPreview(uri),
           ),
         );
       },
@@ -2288,7 +2298,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
         onMailtoDelegateAction: openMailToLink,
         onPreviewEMLDelegateAction: (uri) => _openEMLPreviewer(context, uri),
         onDownloadAttachmentDelegateAction: (uri) =>
-            _downloadAttachmentInEMLPreview(context, uri),
+            _downloadAttachmentInEMLPreview(uri),
       ),
       barrierColor: AppColor.colorDefaultCupertinoActionSheet,
     );
@@ -2305,14 +2315,14 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     previewEMLFileAction(Id(blobId), AppLocalizations.of(context));
   }
 
-  Future<void> _downloadAttachmentInEMLPreview(BuildContext context, Uri? uri) async {
+  Future<void> _downloadAttachmentInEMLPreview(Uri? uri) async {
     log('SingleEmailController::_downloadAttachmentInEMLPreview:uri = $uri');
     if (uri == null) return;
 
     final attachment = EmailUtils.parsingAttachmentByUri(uri);
     if (attachment == null) return;
 
-    handleDownloadAttachmentAction(context, attachment);
+    handleDownloadAttachmentAction(attachment);
   }
 
   void handleMailToAttendees(CalendarOrganizer? organizer, List<CalendarAttendee>? attendees) {
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index bf28d07ce..f46be1359 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -447,10 +447,7 @@ class EmailView extends GetWidget<SingleEmailController> {
                     .disableAttachmentDraggableApp();
               },
               downloadAttachmentAction: (attachment) =>
-                  controller.handleDownloadAttachmentAction(
-                    context,
-                    attachment,
-                  ),
+                  controller.handleDownloadAttachmentAction(attachment),
               viewAttachmentAction: (attachment) =>
                   controller.handleViewAttachmentAction(
                     context,
@@ -464,7 +461,6 @@ class EmailView extends GetWidget<SingleEmailController> {
                   controller.downloadAllButtonIsEnabled(),
               onTapDownloadAllButton: () =>
                   controller.handleDownloadAllAttachmentsAction(
-                context,
                 'TwakeMail-${DateTime.now()}',
               ),
               singleEmailControllerTag: tag,