diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index 8e223ad3d..8c4e83474 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -221,6 +221,8 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
 
   String get ownEmailAddress => mailboxDashBoardController.ownEmailAddress.value;
 
+  GlobalObjectKey? get htmlViewKey => _threadDetailController?.expandedEmailHtmlViewKey;
+
   SingleEmailController(
     this._getEmailContentInteractor,
     this._markAsEmailReadInteractor,
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index 90d28cb66..2060a86df 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -348,7 +348,7 @@ class EmailView extends GetWidget<SingleEmailController> {
                 return Padding(
                   padding: EmailViewStyles.emailContentPadding,
                   child: HtmlContentViewerOnWeb(
-                    key: ValueKey(tag),
+                    key: controller.htmlViewKey,
                     widthContent: bodyConstraints.maxWidth,
                     contentHtml: allEmailContents,
                     mailtoDelegate: controller.openMailToLink,
diff --git a/lib/features/thread_detail/presentation/thread_detail_controller.dart b/lib/features/thread_detail/presentation/thread_detail_controller.dart
index 70e397c70..3bea684a1 100644
--- a/lib/features/thread_detail/presentation/thread_detail_controller.dart
+++ b/lib/features/thread_detail/presentation/thread_detail_controller.dart
@@ -143,6 +143,9 @@ class ThreadDetailController extends BaseController {
       networkConnectionController.isNetworkConnectionAvailable();
   bool get isThreadDetailEnabled =>
       threadDetailManager.isThreadDetailEnabled;
+  GlobalObjectKey? get expandedEmailHtmlViewKey => currentExpandedEmailId.value != null
+      ? GlobalObjectKey(currentExpandedEmailId.value!)
+      : null;
 
   @override
   void onInit() {