From 579372b4a75e39c9e84010de16d7d46294bed04a Mon Sep 17 00:00:00 2001
From: Damian Poddebniak <poddebniak@mailbox.org>
Date: Tue, 30 May 2023 12:04:03 +0200
Subject: [PATCH] chore: Improve readability of `Envelope`.

* Sorted according to RFC.
* Separated IMAP4rev1 and other values.
---
 melib/src/email.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/melib/src/email.rs b/melib/src/email.rs
index 84622b9e..37b9b467 100644
--- a/melib/src/email.rs
+++ b/melib/src/email.rs
@@ -215,16 +215,20 @@ crate::declare_u64_hash!(EnvelopeHash);
 /// bytes into an `Attachment` object.
 #[derive(Clone, Serialize, Deserialize)]
 pub struct Envelope {
-    pub hash: EnvelopeHash,
+    // ----- IMAP4rev1 -----
     pub date: String,
-    pub timestamp: UnixTimestamp,
+    pub subject: Option<String>,
     pub from: SmallVec<[Address; 1]>,
+    // pub sender
+    // pub reply_to
     pub to: SmallVec<[Address; 1]>,
     pub cc: SmallVec<[Address; 1]>,
     pub bcc: Vec<Address>,
-    pub subject: Option<String>,
-    pub message_id: MessageID,
     pub in_reply_to: Option<MessageID>,
+    pub message_id: MessageID,
+    // ----- Other -----
+    pub hash: EnvelopeHash,
+    pub timestamp: UnixTimestamp,
     pub references: Option<References>,
     pub other_headers: HeaderMap,
     pub thread: ThreadNodeHash,