diff --git a/commands/msg/forward.go b/commands/msg/forward.go
index 0c6b0e0..b17482f 100644
--- a/commands/msg/forward.go
+++ b/commands/msg/forward.go
@@ -74,14 +74,13 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error {
 		"To":      to,
 		"Subject": subject,
 	}
-	original := models.OriginalMail{}
+	original := models.OriginalMail{
+		From:          format.FormatAddresses(msg.Envelope.From),
+		Date:          msg.Envelope.Date,
+		RFC822Headers: msg.RFC822Headers,
+	}
 
 	addTab := func() (*widgets.Composer, error) {
-		if template != "" {
-			original.From = format.FormatAddresses(msg.Envelope.From)
-			original.Date = msg.Envelope.Date
-		}
-
 		composer, err := widgets.NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(),
 			acct.Worker(), template, defaults, original)
 		if err != nil {
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 8503979..0298ac2 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -152,14 +152,13 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error {
 		"Subject":     subject,
 		"In-Reply-To": msg.Envelope.MessageId,
 	}
-	original := models.OriginalMail{}
+	original := models.OriginalMail{
+		From: format.FormatAddresses(msg.Envelope.From),
+		Date: msg.Envelope.Date,
+		RFC822Headers: msg.RFC822Headers,
+	}
 
 	addTab := func() error {
-		if template != "" {
-			original.From = format.FormatAddresses(msg.Envelope.From)
-			original.Date = msg.Envelope.Date
-		}
-
 		composer, err := widgets.NewComposer(aerc, acct, aerc.Config(),
 			acct.AccountConfig(), acct.Worker(), template, defaults, original)
 		if err != nil {
diff --git a/models/models.go b/models/models.go
index bfe0ff3..45f3b9d 100644
--- a/models/models.go
+++ b/models/models.go
@@ -134,8 +134,9 @@ type Envelope struct {
 
 // OriginalMail is helper struct used for reply/forward
 type OriginalMail struct {
-	Date     time.Time
-	From     string
-	Text     string
-	MIMEType string
+	Date          time.Time
+	From          string
+	Text          string
+	MIMEType      string
+	RFC822Headers *mail.Header
 }