diff --git a/lib/domain/contact_manager/contacts_manager.dart b/lib/domain/contact_manager/contacts_manager.dart
index 1cac10b553..cf3162d887 100644
--- a/lib/domain/contact_manager/contacts_manager.dart
+++ b/lib/domain/contact_manager/contacts_manager.dart
@@ -3,18 +3,22 @@ import 'package:fluffychat/app_state/failure.dart';
 import 'package:fluffychat/app_state/success.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/domain/app_state/contact/get_contacts_state.dart';
-import 'package:fluffychat/domain/app_state/contact/get_phonebook_contacts_state.dart';
+import 'package:fluffychat/domain/app_state/contact/get_phonebook_contact_state_v2.dart';
 import 'package:fluffychat/domain/usecase/contacts/get_tom_contacts_interactor.dart';
 import 'package:fluffychat/domain/usecase/contacts/phonebook_contact_interactor.dart';
+import 'package:fluffychat/domain/usecase/contacts/phonebook_contact_interactor_v2.dart';
 import 'package:fluffychat/presentation/extensions/value_notifier_custom.dart';
+import 'package:flutter/material.dart';
 
 class ContactsManager {
-  static const int _lookupChunkSize = 50;
+  static const int _lookupChunkSize = 10;
 
   final GetTomContactsInteractor getTomContactsInteractor;
 
   final PhonebookContactInteractor phonebookContactInteractor;
 
+  final PhonebookContactInteractorV2 phonebookContactInteractorV2;
+
   bool _doNotShowWarningContactsBannerAgain = false;
 
   bool _doNotShowWarningContactsDialogAgain = false;
@@ -24,11 +28,12 @@ class ContactsManager {
 
   final ValueNotifierCustom<Either<Failure, Success>>
       _phonebookContactsNotifier =
-      ValueNotifierCustom(const Right(GetPhonebookContactsInitial()));
+      ValueNotifierCustom(const Right(GetPhonebookContactsV2Initial()));
 
   ContactsManager({
     required this.getTomContactsInteractor,
     required this.phonebookContactInteractor,
+    required this.phonebookContactInteractorV2,
   });
 
   ValueNotifierCustom<Either<Failure, Success>> getContactsNotifier() =>
@@ -57,7 +62,7 @@ class ContactsManager {
   Future<void> reSyncContacts() async {
     _contactsNotifier.value = const Right(ContactsInitial());
     _phonebookContactsNotifier.value =
-        const Right(GetPhonebookContactsInitial());
+        const Right(GetPhonebookContactsV2Initial());
   }
 
   void initialSynchronizeContacts({
@@ -89,17 +94,27 @@ class ContactsManager {
   void _fetchPhonebookContacts({
     bool isAvailableSupportPhonebookContacts = false,
   }) async {
-    if (!isAvailableSupportPhonebookContacts) {
-      return;
-    }
-
-    phonebookContactInteractor
+    // if (!isAvailableSupportPhonebookContacts) {
+    //   return;
+    // }
+    phonebookContactInteractorV2
         .execute(lookupChunkSize: _lookupChunkSize)
         .listen(
       (event) {
+        debugPrint(
+          'DEBUG::ContactManager:_fetchPhonebookContacts $event',
+        );
+
         _phonebookContactsNotifier.value = event;
       },
     );
+    // phonebookContactInteractor
+    //     .execute(lookupChunkSize: _lookupChunkSize)
+    //     .listen(
+    //   (event) {
+    //     _phonebookContactsNotifier.value = event;
+    //   },
+    // );
   }
 
   void refreshPhonebookContacts() =>
diff --git a/lib/presentation/mixins/comparable_presentation_contact_mixin.dart b/lib/presentation/mixins/comparable_presentation_contact_mixin.dart
index d25ba499ab..811b3ae796 100644
--- a/lib/presentation/mixins/comparable_presentation_contact_mixin.dart
+++ b/lib/presentation/mixins/comparable_presentation_contact_mixin.dart
@@ -11,14 +11,12 @@ mixin ComparablePresentationContactMixin {
     buffer1.writeAll([
       contact1.matrixId ?? "",
       contact1.displayName ?? "",
-      contact1.email ?? "",
       contact1.status ?? "",
     ]);
 
     buffer2.writeAll([
       contact2.matrixId ?? "",
       contact2.displayName ?? "",
-      contact2.email ?? "",
       contact2.status ?? "",
     ]);