From cb47c68771fcea68c7cf1475b1dd149f6015955f Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 19 Jul 2018 19:52:27 +0200
Subject: [PATCH] Sort mailheaders in display

---
 home-manager/packages/rust-scripts/src/mail.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/home-manager/packages/rust-scripts/src/mail.rs b/home-manager/packages/rust-scripts/src/mail.rs
index c376f53e..855c9c70 100644
--- a/home-manager/packages/rust-scripts/src/mail.rs
+++ b/home-manager/packages/rust-scripts/src/mail.rs
@@ -57,8 +57,8 @@ fn move_mail(mail: &MailEntry, oldbox: &str, newbox: &str) -> Result<()> {
 }
 
 lazy_static!{
-    static ref SHOWN_HEADERS: HashSet<String> = {
-        let raw = ["Date", "To", "From", "Subject", "Cc", "Bcc" ];
+    static ref SHOWN_HEADERS: Vec<String> = {
+        let raw = ["From", "Subject", "Cc", "Bcc", "Date", "To" ];
         raw.iter().map(|&x| x.into()).collect()
     };
 }
@@ -71,6 +71,8 @@ fn print_headers(mail: &mut MailEntry) -> Result<String> {
             headers.push((key, header.get_value()?))
         }
     }
+    headers.sort_by_key(|(k, _)| SHOWN_HEADERS.binary_search(&k).unwrap_or(10));
+    headers.reverse();
     let headers = headers
         .iter()
         .map(|(k, v)| format!("{}: {}", k, v))