diff --git a/model/lib/extensions/list_email_extension.dart b/model/lib/extensions/list_email_extension.dart
index fb6e00511..f0bd55d5e 100644
--- a/model/lib/extensions/list_email_extension.dart
+++ b/model/lib/extensions/list_email_extension.dart
@@ -18,14 +18,13 @@ extension ListEmailExtension on List<Email> {
 
   void sortBy(Comparator comparator) {
     sort((email1, email2) {
-      if (comparator.property == EmailComparatorProperty.sentAt
-          || comparator.property == EmailComparatorProperty.receivedAt) {
-        final emailTime1 = email1.sentAt ?? email1.receivedAt;
-        final emailTime2 = email2.sentAt ?? email2.receivedAt;
-        return emailTime1.compareToSort(emailTime2, comparator.isAscending);
-      } if (comparator.property == EmailComparatorProperty.subject) {
+      if (comparator.property == EmailComparatorProperty.receivedAt) {
+        return email1.receivedAt.compareToSort(email2.receivedAt, comparator.isAscending);
+      } else if (comparator.property == EmailComparatorProperty.sentAt) {
+        return email1.sentAt.compareToSort(email2.sentAt, comparator.isAscending);
+      } else if (comparator.property == EmailComparatorProperty.subject) {
         return email1.subject.compareToSort(email2.subject, comparator.isAscending);
-      } if (comparator.property == EmailComparatorProperty.size) {
+      } else if (comparator.property == EmailComparatorProperty.size) {
         return email1.size.compareToSort(email2.size, comparator.isAscending);
       } else {
         return 0;