db/message: get the sender from the message file, not from notmuch

1 files changed, 4 insertions, 7 deletions

diff --git a/alot/db/message.py b/alot/db/message.py
index f20e3af6..c055aeb2 100644
--- a/alot/db/message.py
+++ b/alot/db/message.py
@@ -11,7 +11,6 @@ from notmuch import NullPointerError
 
 from . import utils
 from .utils import extract_body
-from .utils import decode_header
 from .attachment import Attachment
 from .. import helper
 from ..settings.const import settings
@@ -88,12 +87,10 @@ class Message:
         self._attachments = None  # will be read upon first use
         self._tags = set(msg.get_tags())
 
-        try:
-            sender = decode_header(msg.get_header('From'))
-            if not sender:
-                sender = decode_header(msg.get_header('Sender'))
-        except NullPointerError:
-            sender = None
+        sender = self._email.get('From')
+        if sender is None:
+            sender = self._email.get('Sender')
+
         if sender:
             self._from = sender
         elif 'draft' in self._tags: