diff --git a/core/lib/presentation/extensions/scroll_controller_extension.dart b/core/lib/presentation/extensions/scroll_controller_extension.dart
index 5bd2d56c2..e2b2309ac 100644
--- a/core/lib/presentation/extensions/scroll_controller_extension.dart
+++ b/core/lib/presentation/extensions/scroll_controller_extension.dart
@@ -1,31 +1,6 @@
 import 'package:flutter/material.dart';
 
 extension ScrollControllerExtension on ScrollController {
-  void scrollToWidgetTop({
-    required GlobalKey key,
-    double padding = 70,
-  }) {
-    final context = key.currentContext;
-    if (context == null) return;
-
-    final renderBox = context.findRenderObject();
-    if (renderBox is! RenderBox) return;
-
-    final offsetY = renderBox.localToGlobal(Offset.zero).dy;
-    final currentScroll = offset;
-
-    final targetOffset = (currentScroll + offsetY - padding).clamp(
-      position.minScrollExtent,
-      position.maxScrollExtent,
-    );
-
-    animateTo(
-      targetOffset,
-      duration: const Duration(milliseconds: 500),
-      curve: Curves.easeInOut,
-    );
-  }
-
   void scrollToBottomWithPadding({required double padding}) {
     try {
       final maxExtent = position.maxScrollExtent;
diff --git a/lib/features/email/presentation/extensions/handle_open_attachment_list_extension.dart b/lib/features/email/presentation/extensions/handle_open_attachment_list_extension.dart
index b97e02de9..8680d4441 100644
--- a/lib/features/email/presentation/extensions/handle_open_attachment_list_extension.dart
+++ b/lib/features/email/presentation/extensions/handle_open_attachment_list_extension.dart
@@ -22,9 +22,13 @@ extension HandleOpenAttachmentListExtension on SingleEmailController {
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (PlatformInfo.isWeb && attachmentListKey != null) {
-        scrollController.scrollToWidgetTop(
-          key: attachmentListKey!,
-          padding: 70,
+        final context = attachmentListKey!.currentContext;
+        if (context == null) return;
+
+        Scrollable.ensureVisible(
+          context,
+          duration: const Duration(milliseconds: 500),
+          curve: Curves.easeInOut,
         );
       } else {
         final emailContentHeight =
diff --git a/lib/features/email/presentation/widgets/attachment_list/attachment_list_item_widget.dart b/lib/features/email/presentation/widgets/attachment_list/attachment_list_item_widget.dart
deleted file mode 100644
index e69de29bb..000000000