diff --git a/lib/features/manage_account/domain/model/edit_identity_request.dart b/lib/features/manage_account/domain/model/edit_identity_request.dart
new file mode 100644
index 000000000..d1888d7df
--- /dev/null
+++ b/lib/features/manage_account/domain/model/edit_identity_request.dart
@@ -0,0 +1,14 @@
+
+import 'package:equatable/equatable.dart';
+import 'package:jmap_dart_client/jmap/identities/identity.dart';
+
+class EditIdentityRequest with EquatableMixin {
+
+  final Identity newIdentity;
+  final IdentityId identityId;
+
+  EditIdentityRequest(this.identityId, this.newIdentity);
+
+  @override
+  List<Object?> get props => [identityId, newIdentity];
+}
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/repository/manage_account_repository.dart b/lib/features/manage_account/domain/repository/manage_account_repository.dart
index d12e87b27..2c44065e7 100644
--- a/lib/features/manage_account/domain/repository/manage_account_repository.dart
+++ b/lib/features/manage_account/domain/repository/manage_account_repository.dart
@@ -1,7 +1,7 @@
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/identities/identity.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_identity_request.dart';
-import 'package:jmap_dart_client/jmap/identities/identity.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/identities_response.dart';
 
 abstract class ManageAccountRepository {
@@ -10,4 +10,6 @@ abstract class ManageAccountRepository {
   Future<Identity> createNewIdentity(AccountId accountId, CreateNewIdentityRequest identityRequest);
 
   Future<bool> deleteIdentity(AccountId accountId, IdentityId identityId);
+
+  Future<Identity> editIdentity(AccountId accountId, EditIdentityRequest identityRequest);
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/edit_identity_state.dart b/lib/features/manage_account/domain/state/edit_identity_state.dart
new file mode 100644
index 000000000..31278007b
--- /dev/null
+++ b/lib/features/manage_account/domain/state/edit_identity_state.dart
@@ -0,0 +1,21 @@
+import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/identities/identity.dart';
+
+class EditIdentitySuccess extends UIState {
+
+  final Identity newIdentity;
+
+  EditIdentitySuccess(this.newIdentity);
+
+  @override
+  List<Object?> get props => [newIdentity];
+}
+
+class EditIdentityFailure extends FeatureFailure {
+  final dynamic exception;
+
+  EditIdentityFailure(this.exception);
+
+  @override
+  List<Object> get props => [exception];
+}
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/usecases/edit_identity_interactor.dart b/lib/features/manage_account/domain/usecases/edit_identity_interactor.dart
new file mode 100644
index 000000000..06f236712
--- /dev/null
+++ b/lib/features/manage_account/domain/usecases/edit_identity_interactor.dart
@@ -0,0 +1,23 @@
+import 'dart:core';
+
+import 'package:core/core.dart';
+import 'package:dartz/dartz.dart';
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/model/edit_identity_request.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/repository/manage_account_repository.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/state/edit_identity_state.dart';
+
+class EditIdentityInteractor {
+  final ManageAccountRepository manageAccountRepository;
+
+  EditIdentityInteractor(this.manageAccountRepository);
+
+  Stream<Either<Failure, Success>> execute(AccountId accountId, EditIdentityRequest identityRequest) async* {
+    try {
+      final newIdentity = await manageAccountRepository.editIdentity(accountId, identityRequest);
+      yield Right(EditIdentitySuccess(newIdentity));
+    } catch (exception) {
+      yield Left(EditIdentityFailure(exception));
+    }
+  }
+}
\ No newline at end of file