diff --git a/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart b/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart
index 7ca9b41e1..ea9fb12de 100644
--- a/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart
+++ b/lib/features/identity_creator/presentation/widgets/identity_drop_list_field_builder.dart
@@ -40,8 +40,8 @@ class IdentityDropListFieldBuilder extends StatelessWidget {
       DropdownButtonHideUnderline(
         child: DropdownButton2<EmailAddress>(
           isExpanded: true,
-          hint: Row(
-            children: const [
+          hint: const Row(
+            children: [
               Expanded(child: Text(
                 '',
                 style: TextStyle(fontSize: 16, fontWeight: FontWeight.normal, color: Colors.black),
diff --git a/lib/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart
index bc646790c..93f8f88ba 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart
@@ -8,8 +8,8 @@ import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
 import 'package:model/extensions/mailbox_extension.dart';
+import 'package:model/extensions/presentation_mailbox_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
-import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/base/base_controller.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';