diff --git a/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart b/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart
index 894796cde..74be4446e 100644
--- a/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart
+++ b/lib/features/thread_detail/presentation/extension/get_thread_details_email_views.dart
@@ -46,9 +46,10 @@ extension GetThreadDetailEmailViews on ThreadDetailController {
       final isFirstEmailInThreadDetail = indexOfEmailId == 0;
 
       if (presentationEmail.emailInThreadStatus == EmailInThreadStatus.collapsed) {
-        final emailLabels = labels?.isNotEmpty == true && isFirstEmailInThreadDetail
-            ? emailIdsPresentation.values.last?.getLabelList(labels!)
-            : null;
+        final emailLabels = _getLabelsForFirstEmail(
+          isFirstEmailInThreadDetail: isFirstEmailInThreadDetail,
+          availableLabels: labels,
+        );
 
         return ThreadDetailCollapsedEmail(
           presentationEmail: presentationEmail.copyWith(
@@ -109,4 +110,18 @@ extension GetThreadDetailEmailViews on ThreadDetailController {
       );
     }).toList();
   }
+
+  List<Label>? _getLabelsForFirstEmail({
+    required bool isFirstEmailInThreadDetail,
+    required List<Label>? availableLabels,
+  }) {
+    if (!isFirstEmailInThreadDetail ||
+        availableLabels == null ||
+        availableLabels.isEmpty) {
+      return null;
+    }
+
+    final lastEmail = emailIdsPresentation.values.last;
+    return lastEmail?.getLabelList(availableLabels);
+  }
 }
\ No newline at end of file