Database schema optimization - part 13 (fixes #1882 fixes #2415)

crates/types/src/field.rs

@@ -41,6 +41,7 @@ pub enum EmailField {
     Archive,
     Metadata,
     Threading,
+    DeletedAt,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -118,6 +119,7 @@ impl From<EmailField> for u8 {
         match value {
             EmailField::Metadata => 71,
             EmailField::Threading => 90,
+            EmailField::DeletedAt => 91,
             EmailField::Archive => ARCHIVE_FIELD,
         }
     }

crates/types/src/keyword.rs

@@ -38,6 +38,7 @@ pub const OTHER: usize = 12;
 #[serde(untagged)]
 #[rkyv(derive(PartialEq), compare(PartialEq))]
 pub enum Keyword {
+    Other(Box<str>),
     #[serde(rename(serialize = "$seen"))]
     Seen,
     #[serde(rename(serialize = "$draft"))]
@@ -63,7 +64,6 @@ pub enum Keyword {
     Forwarded,
     #[serde(rename(serialize = "$mdnsent"))]
     MdnSent,
-    Other(Box<str>),
 }
 
 impl Keyword {