commands/thread: stop calling get_email() unnecessarily

1 files changed, 2 insertions, 3 deletions

diff --git a/alot/commands/thread.py b/alot/commands/thread.py
index f34a371d..c302aad0 100644
--- a/alot/commands/thread.py
+++ b/alot/commands/thread.py
@@ -479,7 +479,6 @@ class EditNewCommand(Command):
     async def apply(self, ui):
         if not self.message:
             self.message = ui.current_buffer.get_selected_message()
-        mail = self.message.get_email()
         # copy most tags to the envelope
         tags = set(self.message.get_tags())
         tags.difference_update({'inbox', 'sent', 'draft', 'killed', 'replied',
@@ -493,8 +492,8 @@ class EditNewCommand(Command):
         to_copy = ['Subject', 'From', 'To', 'Cc', 'Bcc', 'In-Reply-To',
                    'References']
         for key in to_copy:
-            value = mail.get(key, '')
-            if value:
+            if key in self.message.headers:
+                value = self.message.headers[key][0]
                 envelope.add(key, value)
 
         # copy attachments