diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f70d818137..1b9fd1b853 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1420,7 +1420,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 time = new SpannableStringBuilderEx(Helper.getRelativeDateSpanString(context, message.received));
             else
                 time = new SpannableStringBuilderEx(
-                        (date || date_fixed) && FragmentMessages.SORT_DATE_HEADER.contains(sort)
+                        (date && !date_fixed && FragmentMessages.SORT_DATE_HEADER.contains(sort)) ||
+                                (date_fixed && "time".equals(sort))
                                 ? TF.format(message.received)
                                 : Helper.getRelativeTimeSpanString(context, message.received));
             if (show_recent && message.recent)