diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 29a8e08d38..626164ddd9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -978,10 +978,15 @@ public class FragmentMessages extends FragmentBase
                 if (!ch && !dh)
                     return null;
 
-                if (EntityMessage.PRIORITIY_HIGH.equals(message.importance)) {
+                Integer importance =
+                        (viewType == AdapterMessage.ViewType.UNIFIED ||
+                                viewType == AdapterMessage.ViewType.FOLDER
+                                ? message.importance : null);
+
+                if (EntityMessage.PRIORITIY_HIGH.equals(importance)) {
                     if (pos > 0)
                         return null;
-                } else if (EntityMessage.PRIORITIY_LOW.equals(message.importance)) {
+                } else if (EntityMessage.PRIORITIY_LOW.equals(importance)) {
                     if (prev != null && EntityMessage.PRIORITIY_LOW.equals(prev.importance))
                         return null;
                 } else if (pos > 0) {
@@ -1031,9 +1036,9 @@ public class FragmentMessages extends FragmentBase
                         vSeparator.setVisibility(View.GONE);
                     }
 
-                    if (EntityMessage.PRIORITIY_HIGH.equals(message.importance))
+                    if (EntityMessage.PRIORITIY_HIGH.equals(importance))
                         tvDate.setText(R.string.title_important);
-                    else if (EntityMessage.PRIORITIY_LOW.equals(message.importance))
+                    else if (EntityMessage.PRIORITIY_LOW.equals(importance))
                         tvDate.setText(R.string.title_unimportant);
                     else
                         tvDate.setText(date_week