diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 123a3ce3c0..d5440481d7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -944,7 +944,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvSize.setVisibility(
                     message.totalSize != null && ("size".equals(sort) || "attachments".equals(sort))
                             ? View.VISIBLE : View.GONE);
-            tvTime.setText(date && "time".equals(sort)
+            tvTime.setText(date && FragmentMessages.SORT_DATE_HEADER.contains(sort)
                     ? TF.format(message.received)
                     : Helper.getRelativeTimeSpanString(context, message.received));
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8062dcfe69..01fcf919c9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -330,11 +330,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     private static final long REVIEW_ASK_DELAY = 21 * 24 * 3600 * 1000L; // milliseconds
     private static final long REVIEW_LATER_DELAY = 3 * 24 * 3600 * 1000L; // milliseconds
 
-    private static final List<String> SORT_DATE_HEADER = Collections.unmodifiableList(Arrays.asList(
-            "time",
-            "unread",
-            "starred",
-            "priority"
+    static final List<String> SORT_DATE_HEADER = Collections.unmodifiableList(Arrays.asList(
+            "time", "unread", "starred", "priority"
     ));
 
     private static final List<String> DUPLICATE_ORDER = Collections.unmodifiableList(Arrays.asList(