From f570c7092747ca8fe410d83f6109f2650c59c134 Mon Sep 17 00:00:00 2001
From: TKE <tobias.kessels@certbw.de>
Date: Fri, 28 Feb 2020 16:23:36 +0100
Subject: [PATCH] added sender to maillisting in imapy

---
 imapy.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/imapy.py b/imapy.py
index 2cede1a..b466058 100755
--- a/imapy.py
+++ b/imapy.py
@@ -84,14 +84,21 @@ def decode(data):
             res+= part[0].decode(part[1])
     return "".join(res.split())
 
+def retrieve(num,field):
+    global im
+    res, data = im.fetch(num,"BODY.PEEK[HEADER.FIELDS ({})]".format(field))
+    x,y = data[0]
+    y=force_decode(y)
+    y=y.split(":",1)
+    y=y[1]
+    return decode(y)
 
 def get_subject(num):
     global im
-    res, data = im.fetch(num,'BODY.PEEK[HEADER.FIELDS (SUBJECT)]')
-    x,y = data[0]
-    y=force_decode(y)
-    y=y[9:]
-    return decode(y)
+    # res, data2 = im.fetch(num,'BODY.PEEK[HEADER.FIELDS (FROM)]')
+    y=retrieve(num,"SUBJECT")
+    z=retrieve(num,"FROM")
+    return "{} von <{}>".format(y,z)
 
 def get_mail(num):
     global im