diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 19aef47239..e206288092 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -659,6 +659,7 @@ public class EntityRule {
 
         if (!TextUtils.isEmpty(create)) {
             Calendar calendar = Calendar.getInstance();
+            calendar.setTimeInMillis(message.received);
             String year = String.format(Locale.ROOT, "%04d", calendar.get(Calendar.YEAR));
             String month = String.format(Locale.ROOT, "%02d", calendar.get(Calendar.MONTH) + 1);
             String week = String.format(Locale.ROOT, "%02d", calendar.get(Calendar.WEEK_OF_YEAR));