diff --git a/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart b/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart
new file mode 100644
index 000000000..da947c810
--- /dev/null
+++ b/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart
@@ -0,0 +1,4 @@
+
+export 'background_isolate_binary_messenger_web.dart'
+  if (dart.library.html) 'background_isolate_binary_messenger_web.dart' // Browser
+  if (dart.library.io) 'background_isolate_binary_messenger_mobile.dart'; // VM
\ No newline at end of file
diff --git a/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger_mobile.dart b/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger_mobile.dart
new file mode 100644
index 000000000..56f26c669
--- /dev/null
+++ b/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger_mobile.dart
@@ -0,0 +1,2 @@
+
+export 'package:flutter/services.dart';
\ No newline at end of file
diff --git a/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger_web.dart b/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger_web.dart
new file mode 100644
index 000000000..c50786587
--- /dev/null
+++ b/lib/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger_web.dart
@@ -0,0 +1,8 @@
+
+class RootIsolateToken {
+  static final RootIsolateToken? instance = () {}();
+}
+
+class BackgroundIsolateBinaryMessenger {
+  static void ensureInitialized(RootIsolateToken token) {}
+}
\ No newline at end of file
diff --git a/lib/features/mailbox/data/model/mailbox_mark_as_read_arguments.dart b/lib/features/mailbox/data/model/mailbox_mark_as_read_arguments.dart
index 0725edf4a..b2440eb3c 100644
--- a/lib/features/mailbox/data/model/mailbox_mark_as_read_arguments.dart
+++ b/lib/features/mailbox/data/model/mailbox_mark_as_read_arguments.dart
@@ -1,9 +1,9 @@
 
 import 'package:equatable/equatable.dart';
-import 'package:flutter/services.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
 import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart';
 
diff --git a/lib/features/mailbox/data/network/mailbox_isolate_worker.dart b/lib/features/mailbox/data/network/mailbox_isolate_worker.dart
index eb0013980..2e56652ef 100644
--- a/lib/features/mailbox/data/network/mailbox_isolate_worker.dart
+++ b/lib/features/mailbox/data/network/mailbox_isolate_worker.dart
@@ -5,7 +5,6 @@ import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flutter/services.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
@@ -20,6 +19,7 @@ import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/email/email_property.dart';
 import 'package:model/email/read_actions.dart';
+import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart';
 import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
 import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_mark_as_read_arguments.dart';
diff --git a/lib/features/thread/data/model/empty_mailbox_folder_arguments.dart b/lib/features/thread/data/model/empty_mailbox_folder_arguments.dart
index 83dd22a73..03a328356 100644
--- a/lib/features/thread/data/model/empty_mailbox_folder_arguments.dart
+++ b/lib/features/thread/data/model/empty_mailbox_folder_arguments.dart
@@ -1,8 +1,8 @@
 import 'package:equatable/equatable.dart';
-import 'package:flutter/services.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
 import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart';
 
diff --git a/lib/features/thread/data/network/thread_isolate_worker.dart b/lib/features/thread/data/network/thread_isolate_worker.dart
index 028bbdfb6..24872ac02 100644
--- a/lib/features/thread/data/network/thread_isolate_worker.dart
+++ b/lib/features/thread/data/network/thread_isolate_worker.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
-import 'package:flutter/services.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
@@ -14,6 +13,7 @@ import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/email/email_property.dart';
 import 'package:model/extensions/list_email_extension.dart';
+import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart';
 import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
 import 'package:tmail_ui_user/features/thread/data/model/empty_mailbox_folder_arguments.dart';
diff --git a/lib/features/upload/data/model/upload_file_arguments.dart b/lib/features/upload/data/model/upload_file_arguments.dart
index b9d2824f3..d030b1f99 100644
--- a/lib/features/upload/data/model/upload_file_arguments.dart
+++ b/lib/features/upload/data/model/upload_file_arguments.dart
@@ -1,7 +1,7 @@
 
 import 'package:core/data/network/dio_client.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flutter/services.dart';
+import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/upload/domain/model/mobile_file_upload.dart';
 import 'package:tmail_ui_user/features/upload/domain/model/upload_task_id.dart';
 
diff --git a/lib/features/upload/data/network/file_uploader.dart b/lib/features/upload/data/network/file_uploader.dart
index 142f7832e..c75e12845 100644
--- a/lib/features/upload/data/network/file_uploader.dart
+++ b/lib/features/upload/data/network/file_uploader.dart
@@ -10,11 +10,11 @@ import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:dartz/dartz.dart';
 import 'package:dio/dio.dart';
-import 'package:flutter/services.dart';
 import 'package:get/get_connect/http/src/request/request.dart';
 import 'package:model/email/attachment.dart';
 import 'package:model/upload/file_info.dart';
 import 'package:model/upload/upload_response.dart';
+import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart';
 import 'package:tmail_ui_user/features/upload/data/model/upload_file_arguments.dart';
 import 'package:tmail_ui_user/features/upload/domain/exceptions/upload_exception.dart';
diff --git a/lib/main/bindings/network/network_isolate_binding.dart b/lib/main/bindings/network/network_isolate_binding.dart
index ed89815fa..2d66eb163 100644
--- a/lib/main/bindings/network/network_isolate_binding.dart
+++ b/lib/main/bindings/network/network_isolate_binding.dart
@@ -9,7 +9,7 @@ import 'package:tmail_ui_user/features/login/data/local/account_cache_manager.da
 import 'package:tmail_ui_user/features/login/data/local/token_oidc_cache_manager.dart';
 import 'package:tmail_ui_user/features/login/data/network/authentication_client/authentication_client_base.dart';
 import 'package:tmail_ui_user/features/login/data/network/config/authorization_interceptors.dart';
-import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_mobile_plugin.dart';
+import 'package:tmail_ui_user/features/login/data/utils/library_platform/app_auth_plugin/app_auth_plugin.dart';
 import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_isolate_worker.dart';
 import 'package:tmail_ui_user/features/thread/data/network/thread_api.dart';
 import 'package:tmail_ui_user/features/thread/data/network/thread_isolate_worker.dart';