diff --git a/storage/migrationTasks.go b/storage/migrationTasks.go
index dd919e7..12bd555 100644
--- a/storage/migrationTasks.go
+++ b/storage/migrationTasks.go
@@ -16,13 +16,13 @@ import (
 )
 
 func dataMigrations() {
-	updateSortByCreatedTask()
+	updateOrderByCreatedTask()
 	assignMessageIDsTask()
 }
 
-// Update Sort column using Created datetime <= v1.6.5
+// Update Created column using Created metadata datetime <= v1.6.5
 // Migration task implemented 05/2023 - can be removed end 2023
-func updateSortByCreatedTask() {
+func updateOrderByCreatedTask() {
 	q := sqlf.From("mailbox").
 		Select("ID").
 		Select(`json_extract(Metadata, '$.Created') as Created`).
diff --git a/storage/utils.go b/storage/utils.go
index ce2cbbb..fb23bc7 100644
--- a/storage/utils.go
+++ b/storage/utils.go
@@ -39,7 +39,7 @@ func createSearchText(env *enmime.Envelope) string {
 	b.WriteString(env.GetHeader("Bcc") + " ")
 	h := strings.TrimSpace(
 		html2text.HTML2TextWithOptions(
-			env.HTML, 
+			env.HTML,
 			html2text.WithLinksInnerText(),
 		),
 	)
@@ -92,7 +92,7 @@ func dbCron() {
 		if config.MaxMessages > 0 {
 			q := sqlf.Select("ID").
 				From("mailbox").
-				OrderBy("Sort DESC").
+				OrderBy("Created DESC").
 				Limit(5000).
 				Offset(config.MaxMessages)