From 8149f5712f735f129647369a5acfb506848b8857 Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Wed, 10 Apr 2019 16:54:25 +0300
Subject: [PATCH] don't overwrite 'From' in Composer'

---
 ui/src/components/mail/compose.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/src/components/mail/compose.rs b/ui/src/components/mail/compose.rs
index 8c749ed9b..880237837 100644
--- a/ui/src/components/mail/compose.rs
+++ b/ui/src/components/mail/compose.rs
@@ -251,14 +251,6 @@ impl Component for Composer {
 
         let upper_left = set_y(upper_left, get_y(upper_left) + 1);
 
-        if self.dirty {
-            self.draft.headers_mut().insert(
-                "From".into(),
-                get_display_name(context, self.account_cursor),
-            );
-            self.dirty = false;
-        }
-
         let width = if width!(area) > 80 && self.reply_context.is_some() {
             width!(area) / 2
         } else {
@@ -266,6 +258,12 @@ impl Component for Composer {
         };
 
         if !self.initialized {
+            if !self.draft.headers().contains_key("From") {
+                self.draft.headers_mut().insert(
+                    "From".into(),
+                    get_display_name(context, self.account_cursor),
+                );
+            }
             self.pager.update_from_str(self.draft.body(), Some(77));
             self.update_form();
             self.initialized = true;