mail/envelope: add a special class for headers

Handle multiple headers with ordering and case-insensitive operations.

1 files changed, 4 insertions, 5 deletions

diff --git a/alot/buffers/envelope.py b/alot/buffers/envelope.py
index 0bc7696f..871e88b5 100644
--- a/alot/buffers/envelope.py
+++ b/alot/buffers/envelope.py
@@ -119,13 +119,12 @@ class EnvelopeBuffer(Buffer):
 
     def rebuild(self):
         displayed_widgets = []
-        hidden = settings.get('envelope_headers_blacklist')
+        hidden = set(map(str.lower, settings.get('envelope_headers_blacklist')))
         # build lines
         lines = []
-        for (k, vlist) in self.envelope.headers.items():
-            if (k not in hidden) or self.all_headers:
-                for value in vlist:
-                    lines.append((k, value))
+        for k, v in self.envelope.headers.items():
+            if (k.lower() not in hidden) or self.all_headers:
+                lines.append((k, v))
 
         # sign/encrypt lines
         if self.envelope.sign: