diff --git a/lib/features/email/presentation/extensions/calendar_event_extension.dart b/lib/features/email/presentation/extensions/calendar_event_extension.dart
index a45fd3041..42ee02083 100644
--- a/lib/features/email/presentation/extensions/calendar_event_extension.dart
+++ b/lib/features/email/presentation/extensions/calendar_event_extension.dart
@@ -383,21 +383,31 @@ extension CalendarEventExtension on CalendarEvent {
     return [];
   }
 
-  bool isDisplayedEventReplyAction(String ownerEmailAddress) => method != null
-    && _methodIsRepliable
-    && organizer != null
-    && participants?.isNotEmpty == true
-    && !validateUserIsNotListedInParticipants(ownerEmailAddress);
+  bool isDisplayedEventReplyAction(String ownerEmailAddress) =>
+      method != null &&
+      _methodIsRepliable &&
+      organizer != null &&
+      participants?.isNotEmpty == true &&
+      userIsListedInParticipants(ownerEmailAddress);
 
   bool get _methodIsRepliable => 
     method == EventMethod.request ||
     method == EventMethod.add ||
     method == EventMethod.counter;
 
-  bool validateUserIsNotListedInParticipants(String ownEmailAddress) {
+  bool userIsListedInParticipants(String ownEmailAddress) {
     final participant = participants?.firstWhereOrNull((participant) =>
     participant.mailto?.mailAddress.value == ownEmailAddress);
-    return participant == null;
+    return participant != null;
+  }
+
+  bool userIsOrganizer(String ownEmailAddress) {
+    return organizer?.mailto?.value == ownEmailAddress;
+  }
+
+  bool isDisplayedWarningMessage(String ownerEmailAddress) {
+    return !userIsListedInParticipants(ownerEmailAddress) &&
+      !userIsOrganizer(ownerEmailAddress);
   }
 
   bool get isDisplayedMailToAttendees =>
diff --git a/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart b/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart
index 86d4ccfbb..8692b83ec 100644
--- a/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart
+++ b/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart
@@ -149,9 +149,7 @@ class CalendarEventInformationWidget extends StatelessWidget {
                 openEmailAddressDetailAction: openEmailAddressDetailAction,
               ),
             ),
-          if (calendarEvent.validateUserIsNotListedInParticipants(
-            ownEmailAddress,
-          ))
+          if (calendarEvent.isDisplayedWarningMessage(ownEmailAddress))
             Padding(
               padding: EdgeInsetsDirectional.only(
                 top: CalendarEventInformationWidgetStyles.fieldTopPadding,