diff options
Diffstat (limited to 'alot/db/message.py')
| -rw-r--r-- | alot/db/message.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/alot/db/message.py b/alot/db/message.py index c4ea5f8a..2e1fef54 100644 --- a/alot/db/message.py +++ b/alot/db/message.py @@ -10,7 +10,8 @@ from datetime import datetime from notmuch import NullPointerError -from .utils import extract_body, message_from_file +from . import utils +from .utils import extract_body from .utils import decode_header from .attachment import Attachment from .. import helper @@ -64,7 +65,7 @@ class Message(object): self._from = sender elif 'draft' in self._tags: acc = settings.get_accounts()[0] - self._from = '"{}" <{}>'.format(acc.realname, unicode(acc.address)) + self._from = '"{}" <{}>'.format(acc.realname, str(acc.address)) else: self._from = '"Unknown" <>' @@ -101,8 +102,8 @@ class Message(object): "Message file is no longer accessible:\n%s" % path if not self._email: try: - with open(path) as f: - self._email = message_from_file(f) + with open(path, 'rb') as f: + self._email = utils.message_from_bytes(f.read()) except IOError: self._email = email.message_from_string(warning) return self._email |