diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart
index a5e3def8e..c33c0358b 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart
@@ -106,7 +106,7 @@ class _TextFieldAutoCompleteEmailAddressState
         return widget.optionsBuilder.call(textEditingValue.text.toLowerCase());
       },
       onSelected: (EmailAddress selectedTag) {
-        _controller.addTag = selectedTag.asString();
+        _controller.addTag = selectedTag.emailAddress;
       },
       fieldViewBuilder: (context, ttec, tfn, onFieldSubmitted) {
         return TextFieldTags(
diff --git a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart
index 5088d2c1e..6bac85aa5 100644
--- a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart
+++ b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart
@@ -1,4 +1,3 @@
-import 'package:core/core.dart';
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/state/success.dart';