Not update the email in cache if cache not hit

lib/features/thread/data/repository/thread_repository_impl.dart

@@ -1,5 +1,6 @@
 
 import 'package:core/core.dart';
+import 'package:dartz/dartz.dart' as dartz;
 import 'package:flutter/foundation.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/filter/filter.dart';
@@ -143,24 +144,29 @@ class ThreadRepositoryImpl extends ThreadRepository {
     List<Email>? emailCacheList
   }) async {
     if (emailUpdated != null && emailUpdated.isNotEmpty) {
-      final newEmailUpdated = emailUpdated.map((email) {
+      if (updatedProperties == null) {
-        if (updatedProperties == null) {
+        return null;
-          return email;
+      }
-        } else {
+      final newEmailUpdated = emailUpdated
-          final emailOld = emailCacheList?.findEmailById(email.id);
+        .map((updatedEmail) => _combineUpdatedWithEmailInCache(updatedEmail, emailCacheList))
-          if (emailOld != null) {
+        .where((tuple) => tuple.value2 != null)
-            return emailOld.combineEmail(email, updatedProperties);
+        .map((tuple) => tuple.value2!.combineEmail(tuple.value1, updatedProperties))
-          } else {
+        .toList();
-            return email;
-          }
-        }
-      }).toList();
 
       return newEmailUpdated;
     }
     return emailUpdated;
   }
 
+  dartz.Tuple2<Email, Email?> _combineUpdatedWithEmailInCache(Email updatedEmail, List<Email>? emailCacheList) {
+    final emailOld = emailCacheList?.findEmailById(updatedEmail.id);
+    if (emailOld != null) {
+      return dartz.Tuple2(updatedEmail, emailOld);
+    } else {
+      return dartz.Tuple2(updatedEmail, null);
+    }
+  }
+
   Future<void> _updateEmailCache({
     List<Email>? newUpdated,
     List<Email>? newCreated,