Received: from sender4-of-o54.zoho.com (sender4-of-o54.zoho.com [136.143.188.54])
	by mail.sr.ht (Postfix) with ESMTPS id 1A66240732
	for <~sircmpwn/aerc@lists.sr.ht>; Sun,  3 Nov 2019 12:51:25 +0000 (UTC)
Authentication-Results: mail.sr.ht;
	dkim=pass (1024-bit key) header.d=vathsan.com header.i=sri@vathsan.com header.b=aw57GxI7
ARC-Seal: i=1; a=rsa-sha256; t=1572785482; cv=none; 
	d=zohomail.com; s=zohoarc; 
	b=PUOzfUpFLHitfHR4scPYsB+oTGJAlqRu04Y9T0BQYHJcNJ5LFy9dGJuKfTFqAo8n5Up4vaTHpMffi3SJ7MqyvukSU+PbyXr6ePGS1nBABgXZ8CBZ7OeyItGudWAnriWuYKBBUzhWZpsnH8RqDEA2wvrqds4Py9aamGyyCaKuAYM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; 
	t=1572785482; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; 
	bh=BDLV1NdgETUWeoQ0qgEZJZylBi4tMNr/RGz1TNfd3HM=; 
	b=BeR005YfZdM45JDBhMQna1hDkRAxI3UneGVn3wDpAdtRfKlRPxU0nJr7OZuAcSmbRBaseVFdDr7PYI9Y+WJl4aWxGg8sC+2A22DgylBjC8IX6Td1I2RDamAN3G+Jz0jSdF3rVlgqFQT+tMMX3nK7ImZq2l5ZgedsodQqTM1S9Cg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass  header.i=vathsan.com;
	spf=pass  smtp.mailfrom=sri@vathsan.com;
	dmarc=pass header.from=<sri@vathsan.com> header.from=<sri@vathsan.com>
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1572785482;
	s=zoho; d=vathsan.com; i=sri@vathsan.com;
	h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Transfer-Encoding:Content-Type;
	l=33050; bh=BDLV1NdgETUWeoQ0qgEZJZylBi4tMNr/RGz1TNfd3HM=;
	b=aw57GxI777Sb9ZqeCO+ocGqUYOPDkr12TCSVKDerJvV9rb7QHtA9jH7Os+PXgYxG
	ghPv5h1UDsHTFOEO7vQ7DRFJP1Dn1VkYrNnl64mJwMmtLAVvv9alzpllo0yHvbg4+xZ
	Vhjeoe2knhBQOTlfGJ1E77MmzKcfn8A6ra0uDUn0=
Received: from localhost (212-51-138-70.fiber7.init7.net [212.51.138.70]) by mx.zohomail.com
	with SMTPS id 1572785480425920.5673047980583; Sun, 3 Nov 2019 04:51:20 -0800 (PST)
From: Srivathsan Murali <sri@vathsan.com>
To: ~sircmpwn/aerc@lists.sr.ht
Cc: Srivathsan Murali <sri@vathsan.com>
Message-ID: <20191103125114.106623-1-sri@vathsan.com>
Subject: [PATCH v4] Add Templates with Parsing
Date: Sun,  3 Nov 2019 13:51:14 +0100
X-Mailer: git-send-email 2.23.0
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-ZohoMailClient: External
Content-Type: text/plain; charset=utf8

+ Changes NewComposer to return error.
+ Add lib to handle templates using "text/template".
+ Add -T option to following commands
    - compose.
    - reply
    - forward
+ Quoted replies using templates.
+ Forwards as body using templates
+ Default templates are installed similar to filters.
+ Templates Config in aerc.conf.
    - Required templates are parsed while loading config.
+ Add aerc-templates.7 manual for using template data.
---
Made template-dirs a colon-separated list of dirs as
requested.
Also added a aerc-templates manual to help with template
creation.

This patch is ready from my side.

Cheers

 Makefile                    |   7 +-
 commands/account/compose.go |  24 ++++--
 commands/msg/forward.go     | 157 ++++++++++++++++++-----------------
 commands/msg/reply.go       |  73 ++++++++--------
 commands/msg/unsubscribe.go |   6 +-
 config/aerc.conf.in         |  22 ++++-
 config/config.go            |  44 ++++++++--
 doc/aerc-config.5.scd       |  25 ++++++
 doc/aerc-templates.7.scd    |  89 ++++++++++++++++++++
 lib/templates/template.go   | 160 ++++++++++++++++++++++++++++++++++++
 templates/forward_as_body   |   2 +
 templates/quoted_reply      |   2 +
 widgets/aerc.go             |   7 +-
 widgets/compose.go          |  37 ++++++++-
 14 files changed, 511 insertions(+), 144 deletions(-)
 create mode 100644 doc/aerc-templates.7.scd
 create mode 100644 lib/templates/template.go
 create mode 100644 templates/forward_as_body
 create mode 100644 templates/quoted_reply

diff --git a/Makefile b/Makefile
index c2e6d1ba4a97..b28746c77fb4 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,8 @@ DOCS :=3D \
 =09aerc-sendmail.5 \
 =09aerc-notmuch.5 \
 =09aerc-smtp.5 \
-=09aerc-tutorial.7
+=09aerc-tutorial.7\
+=09aerc-templates.7
=20
 .1.scd.1:
 =09scdoc < $< > $@
@@ -58,7 +59,7 @@ clean:
=20
 install: all
 =09mkdir -p $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man7 \
-=09=09$(SHAREDIR) $(SHAREDIR)/filters
+=09=09$(SHAREDIR) $(SHAREDIR)/filters $(SHAREDIR)/templates
 =09install -m755 aerc $(BINDIR)/aerc
 =09install -m644 aerc.1 $(MANDIR)/man1/aerc.1
 =09install -m644 aerc-search.1 $(MANDIR)/man1/aerc-search.1
@@ -75,6 +76,8 @@ install: all
 =09install -m755 filters/hldiff $(SHAREDIR)/filters/hldiff
 =09install -m755 filters/html $(SHAREDIR)/filters/html
 =09install -m755 filters/plaintext $(SHAREDIR)/filters/plaintext
+=09install -m644 templates/quoted_reply $(SHAREDIR)/templates/quoted_reply
+=09install -m644 templates/forward_as_body $(SHAREDIR)/templates/forward_a=
s_body
=20
 RMDIR_IF_EMPTY:=3Dsh -c '\
 if test -d $$0 && ! ls -1qA $$0 | grep -q . ; then \
diff --git a/commands/account/compose.go b/commands/account/compose.go
index 039eb92363c6..24e460b318b1 100644
--- a/commands/account/compose.go
+++ b/commands/account/compose.go
@@ -24,13 +24,17 @@ func (Compose) Complete(aerc *widgets.Aerc, args []stri=
ng) []string {
 }
=20
 func (Compose) Execute(aerc *widgets.Aerc, args []string) error {
-=09body, err :=3D buildBody(args)
+=09body, template, err :=3D buildBody(args)
 =09if err !=3D nil {
 =09=09return err
 =09}
 =09acct :=3D aerc.SelectedAccount()
-=09composer :=3D widgets.NewComposer(aerc,
-=09=09aerc.Config(), acct.AccountConfig(), acct.Worker(), nil)
+
+=09composer, err :=3D widgets.NewComposer(aerc,
+=09=09aerc.Config(), acct.AccountConfig(), acct.Worker(), template, nil)
+=09if err !=3D nil {
+=09=09return err
+=09}
 =09tab :=3D aerc.NewTab(composer, "New email")
 =09composer.OnHeaderChange("Subject", func(subject string) {
 =09=09if subject =3D=3D "" {
@@ -44,11 +48,11 @@ func (Compose) Execute(aerc *widgets.Aerc, args []strin=
g) error {
 =09return nil
 }
=20
-func buildBody(args []string) (string, error) {
-=09var body, headers string
-=09opts, optind, err :=3D getopt.Getopts(args, "H:")
+func buildBody(args []string) (string, string, error) {
+=09var body, template, headers string
+=09opts, optind, err :=3D getopt.Getopts(args, "H:T:")
 =09if err !=3D nil {
-=09=09return "", err
+=09=09return "", "", err
 =09}
 =09for _, opt :=3D range opts {
 =09=09switch opt.Option {
@@ -60,11 +64,13 @@ func buildBody(args []string) (string, error) {
 =09=09=09} else {
 =09=09=09=09headers +=3D opt.Value + ":\n"
 =09=09=09}
+=09=09case 'T':
+=09=09=09template =3D opt.Value
 =09=09}
 =09}
 =09posargs :=3D args[optind:]
 =09if len(posargs) > 1 {
-=09=09return "", errors.New("Usage: compose [-H] [body]")
+=09=09return "", template, errors.New("Usage: compose [-H] [body]")
 =09}
 =09if len(posargs) =3D=3D 1 {
 =09=09body =3D posargs[0]
@@ -76,5 +82,5 @@ func buildBody(args []string) (string, error) {
 =09=09=09body =3D headers + "\n\n"
 =09=09}
 =09}
-=09return body, nil
+=09return body, template, nil
 }
diff --git a/commands/msg/forward.go b/commands/msg/forward.go
index 494072d07d04..b4d29137a348 100644
--- a/commands/msg/forward.go
+++ b/commands/msg/forward.go
@@ -1,20 +1,21 @@
 package msg
=20
 import (
-=09"bufio"
+=09"bytes"
 =09"errors"
 =09"fmt"
-=09"git.sr.ht/~sircmpwn/aerc/lib"
-=09"git.sr.ht/~sircmpwn/aerc/models"
-=09"git.sr.ht/~sircmpwn/aerc/widgets"
-=09"git.sr.ht/~sircmpwn/getopt"
-=09"github.com/emersion/go-message"
-=09"github.com/emersion/go-message/mail"
 =09"io"
 =09"io/ioutil"
 =09"os"
 =09"path"
 =09"strings"
+
+=09"github.com/emersion/go-message"
+=09"github.com/emersion/go-message/mail"
+
+=09"git.sr.ht/~sircmpwn/aerc/models"
+=09"git.sr.ht/~sircmpwn/aerc/widgets"
+=09"git.sr.ht/~sircmpwn/getopt"
 )
=20
 type forward struct{}
@@ -32,15 +33,18 @@ func (forward) Complete(aerc *widgets.Aerc, args []stri=
ng) []string {
 }
=20
 func (forward) Execute(aerc *widgets.Aerc, args []string) error {
-=09opts, optind, err :=3D getopt.Getopts(args, "A")
+=09opts, optind, err :=3D getopt.Getopts(args, "AT:")
 =09if err !=3D nil {
 =09=09return err
 =09}
 =09attach :=3D false
+=09template :=3D ""
 =09for _, opt :=3D range opts {
 =09=09switch opt.Option {
 =09=09case 'A':
 =09=09=09attach =3D true
+=09=09case 'T':
+=09=09=09template =3D opt.Value
 =09=09}
 =09}
=20
@@ -69,10 +73,20 @@ func (forward) Execute(aerc *widgets.Aerc, args []strin=
g) error {
 =09=09"To":      to,
 =09=09"Subject": subject,
 =09}
-=09composer :=3D widgets.NewComposer(aerc, aerc.Config(), acct.AccountConf=
ig(),
-=09=09acct.Worker(), defaults)
=20
-=09addTab :=3D func() {
+=09addTab :=3D func() (*widgets.Composer, error) {
+=09=09if template !=3D "" {
+=09=09=09defaults["OriginalFrom"] =3D models.FormatAddresses(msg.Envelope.=
From)
+=09=09=09defaults["OriginalDate"] =3D msg.Envelope.Date.Format("Mon Jan 2,=
 2006 at 3:04 PM")
+=09=09}
+
+=09=09composer, err :=3D widgets.NewComposer(aerc, aerc.Config(), acct.Acc=
ountConfig(),
+=09=09acct.Worker(), template, defaults)
+=09=09if err !=3D nil {
+=09=09=09aerc.PushError("Error: "+err.Error())
+=09=09=09return nil, err
+=09=09}
+
 =09=09tab :=3D aerc.NewTab(composer, subject)
 =09=09if to =3D=3D "" {
 =09=09=09composer.FocusRecipient()
@@ -87,83 +101,68 @@ func (forward) Execute(aerc *widgets.Aerc, args []stri=
ng) error {
 =09=09=09}
 =09=09=09tab.Content.Invalidate()
 =09=09})
+=09=09return composer, nil
 =09}
=20
 =09if attach {
-=09=09forwardAttach(store, composer, msg, addTab)
-=09} else {
-=09=09forwardBodyPart(store, composer, msg, addTab)
-=09}
-=09return nil
-}
-
-func forwardAttach(store *lib.MessageStore, composer *widgets.Composer,
-=09msg *models.MessageInfo, addTab func()) {
-
-=09store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) {
 =09=09tmpDir, err :=3D ioutil.TempDir("", "aerc-tmp-attachment")
 =09=09if err !=3D nil {
-=09=09=09// TODO: Do something with the error
-=09=09=09addTab()
-=09=09=09return
+=09=09=09return err
 =09=09}
 =09=09tmpFileName :=3D path.Join(tmpDir,
-=09=09=09strings.ReplaceAll(fmt.Sprintf("%s.eml", msg.Envelope.Subject), "=
/", "-"))
-=09=09tmpFile, err :=3D os.Create(tmpFileName)
-=09=09if err !=3D nil {
-=09=09=09println(err)
-=09=09=09// TODO: Do something with the error
-=09=09=09addTab()
-=09=09=09return
-=09=09}
+=09=09strings.ReplaceAll(fmt.Sprintf("%s.eml", msg.Envelope.Subject), "/",=
 "-"))
+=09=09store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) {
+=09=09=09tmpFile, err :=3D os.Create(tmpFileName)
+=09=09=09if err !=3D nil {
+=09=09=09=09println(err)
+=09=09=09=09// TODO: Do something with the error
+=09=09=09=09addTab()
+=09=09=09=09return
+=09=09=09}
=20
-=09=09defer tmpFile.Close()
-=09=09io.Copy(tmpFile, reader)
-=09=09composer.AddAttachment(tmpFileName)
-=09=09composer.OnClose(func(composer *widgets.Composer) {
-=09=09=09os.RemoveAll(tmpDir)
+=09=09=09defer tmpFile.Close()
+=09=09=09io.Copy(tmpFile, reader)
+=09=09=09composer, err :=3D addTab()
+=09=09=09if err !=3D nil {
+=09=09=09=09return
+=09=09=09}
+=09=09=09composer.AddAttachment(tmpFileName)
+=09=09=09composer.OnClose(func(composer *widgets.Composer) {
+=09=09=09=09os.RemoveAll(tmpDir)
+=09=09=09})
 =09=09})
-=09=09addTab()
-=09})
-}
-
-func forwardBodyPart(store *lib.MessageStore, composer *widgets.Composer,
-=09msg *models.MessageInfo, addTab func()) {
-=09// TODO: something more intelligent than fetching the 1st part
-=09// TODO: add attachments!
-=09store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) {
-=09=09header :=3D message.Header{}
-=09=09header.SetText(
-=09=09=09"Content-Transfer-Encoding", msg.BodyStructure.Encoding)
-=09=09header.SetContentType(
-=09=09=09msg.BodyStructure.MIMEType, msg.BodyStructure.Params)
-=09=09header.SetText("Content-Description", msg.BodyStructure.Description)
-=09=09entity, err :=3D message.New(header, reader)
-=09=09if err !=3D nil {
-=09=09=09// TODO: Do something with the error
-=09=09=09addTab()
-=09=09=09return
-=09=09}
-=09=09mreader :=3D mail.NewReader(entity)
-=09=09part, err :=3D mreader.NextPart()
-=09=09if err !=3D nil {
-=09=09=09// TODO: Do something with the error
-=09=09=09addTab()
-=09=09=09return
+=09} else {
+=09=09if template =3D=3D "" {
+=09=09=09template =3D aerc.Config().Templates.Forwards
 =09=09}
=20
-=09=09pipeout, pipein :=3D io.Pipe()
-=09=09scanner :=3D bufio.NewScanner(part.Body)
-=09=09go composer.PrependContents(pipeout)
-=09=09// TODO: Let user customize the date format used here
-=09=09io.WriteString(pipein, fmt.Sprintf("Forwarded message from %s on %s:=
\n\n",
-=09=09=09msg.Envelope.From[0].Name,
-=09=09=09msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM")))
-=09=09for scanner.Scan() {
-=09=09=09io.WriteString(pipein, fmt.Sprintf("%s\n", scanner.Text()))
-=09=09}
-=09=09pipein.Close()
-=09=09pipeout.Close()
-=09=09addTab()
-=09})
+=09=09// TODO: something more intelligent than fetching the 1st part
+=09=09// TODO: add attachments!
+=09=09store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) {
+=09=09=09header :=3D message.Header{}
+=09=09=09header.SetText(
+=09=09=09=09"Content-Transfer-Encoding", msg.BodyStructure.Encoding)
+=09=09=09header.SetContentType(
+=09=09=09=09msg.BodyStructure.MIMEType, msg.BodyStructure.Params)
+=09=09=09=09header.SetText("Content-Description", msg.BodyStructure.Descri=
ption)
+=09=09=09=09entity, err :=3D message.New(header, reader)
+=09=09=09=09if err !=3D nil {
+=09=09=09=09=09// TODO: Do something with the error
+=09=09=09=09=09addTab()
+=09=09=09=09=09return
+=09=09=09=09}
+=09=09=09=09mreader :=3D mail.NewReader(entity)
+=09=09=09=09part, err :=3D mreader.NextPart()
+=09=09=09=09if err !=3D nil {
+=09=09=09=09=09// TODO: Do something with the error
+=09=09=09=09=09addTab()
+=09=09=09=09=09return
+=09=09=09=09}
+=09=09=09=09buf :=3D new(bytes.Buffer)
+=09=09=09=09buf.ReadFrom(part.Body)
+=09=09=09=09defaults["Original"] =3D buf.String()
+=09=09=09=09addTab()
+=09=09=09})
+=09}
+=09return nil
 }
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 9ef7a3b82206..e65b504faf39 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -1,7 +1,7 @@
 package msg
=20
 import (
-=09"bufio"
+=09"bytes"
 =09"errors"
 =09"fmt"
 =09"io"
@@ -32,16 +32,17 @@ func (reply) Complete(aerc *widgets.Aerc, args []string=
) []string {
 }
=20
 func (reply) Execute(aerc *widgets.Aerc, args []string) error {
-=09opts, optind, err :=3D getopt.Getopts(args, "aq")
+=09opts, optind, err :=3D getopt.Getopts(args, "aqT:")
 =09if err !=3D nil {
 =09=09return err
 =09}
 =09if optind !=3D len(args) {
-=09=09return errors.New("Usage: reply [-aq]")
+=09=09return errors.New("Usage: reply [-aq -T <template>]")
 =09}
 =09var (
 =09=09quote    bool
 =09=09replyAll bool
+=09=09template string
 =09)
 =09for _, opt :=3D range opts {
 =09=09switch opt.Option {
@@ -49,11 +50,14 @@ func (reply) Execute(aerc *widgets.Aerc, args []string)=
 error {
 =09=09=09replyAll =3D true
 =09=09case 'q':
 =09=09=09quote =3D true
+=09=09case 'T':
+=09=09=09template =3D opt.Value
 =09=09}
 =09}
=20
 =09widget :=3D aerc.SelectedTab().(widgets.ProvidesMessage)
 =09acct :=3D widget.SelectedAccount()
+
 =09if acct =3D=3D nil {
 =09=09return errors.New("No account selected")
 =09}
@@ -116,14 +120,23 @@ func (reply) Execute(aerc *widgets.Aerc, args []strin=
g) error {
 =09=09"In-Reply-To": msg.Envelope.MessageId,
 =09}
=20
-=09composer :=3D widgets.NewComposer(aerc, aerc.Config(),
-=09=09acct.AccountConfig(), acct.Worker(), defaults)
+=09addTab :=3D func() error {
+=09=09if template !=3D "" {
+=09=09=09defaults["OriginalFrom"] =3D models.FormatAddresses(msg.Envelope.=
From)
+=09=09=09defaults["OriginalDate"] =3D msg.Envelope.Date.Format("Mon Jan 2,=
 2006 at 3:04 PM")
+=09=09}
=20
-=09if args[0] =3D=3D "reply" {
-=09=09composer.FocusTerminal()
-=09}
+=09=09composer, err :=3D widgets.NewComposer(aerc, aerc.Config(),
+=09=09=09acct.AccountConfig(), acct.Worker(), template, defaults)
+=09=09if err !=3D nil {
+=09=09=09aerc.PushError("Error: "+err.Error())
+=09=09=09return err
+=09=09}
+
+=09=09if args[0] =3D=3D "reply" {
+=09=09=09composer.FocusTerminal()
+=09=09}
=20
-=09addTab :=3D func() {
 =09=09tab :=3D aerc.NewTab(composer, subject)
 =09=09composer.OnHeaderChange("Subject", func(subject string) {
 =09=09=09if subject =3D=3D "" {
@@ -133,27 +146,21 @@ func (reply) Execute(aerc *widgets.Aerc, args []strin=
g) error {
 =09=09=09}
 =09=09=09tab.Content.Invalidate()
 =09=09})
+
+=09=09return nil
 =09}
=20
 =09if quote {
-=09=09var (
-=09=09=09path []int
-=09=09=09part *models.BodyStructure
-=09=09)
-=09=09if len(msg.BodyStructure.Parts) !=3D 0 {
-=09=09=09part, path =3D findPlaintext(msg.BodyStructure, path)
-=09=09}
-=09=09if part =3D=3D nil {
-=09=09=09part =3D msg.BodyStructure
-=09=09=09path =3D []int{1}
+=09=09if template =3D=3D "" {
+=09=09=09template =3D aerc.Config().Templates.QuotedReply
 =09=09}
=20
-=09=09store.FetchBodyPart(msg.Uid, path, func(reader io.Reader) {
+=09=09store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) {
 =09=09=09header :=3D message.Header{}
 =09=09=09header.SetText(
-=09=09=09=09"Content-Transfer-Encoding", part.Encoding)
-=09=09=09header.SetContentType(part.MIMEType, part.Params)
-=09=09=09header.SetText("Content-Description", part.Description)
+=09=09=09=09"Content-Transfer-Encoding", msg.BodyStructure.Encoding)
+=09=09=09header.SetContentType(msg.BodyStructure.MIMEType, msg.BodyStructu=
re.Params)
+=09=09=09header.SetText("Content-Description", msg.BodyStructure.Descripti=
on)
 =09=09=09entity, err :=3D message.New(header, reader)
 =09=09=09if err !=3D nil {
 =09=09=09=09// TODO: Do something with the error
@@ -168,25 +175,15 @@ func (reply) Execute(aerc *widgets.Aerc, args []strin=
g) error {
 =09=09=09=09return
 =09=09=09}
=20
-=09=09=09pipeout, pipein :=3D io.Pipe()
-=09=09=09scanner :=3D bufio.NewScanner(part.Body)
-=09=09=09go composer.PrependContents(pipeout)
-=09=09=09// TODO: Let user customize the date format used here
-=09=09=09io.WriteString(pipein, fmt.Sprintf("On %s %s wrote:\n",
-=09=09=09=09msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"),
-=09=09=09=09msg.Envelope.From[0].Name))
-=09=09=09for scanner.Scan() {
-=09=09=09=09io.WriteString(pipein, fmt.Sprintf("> %s\n", scanner.Text()))
-=09=09=09}
-=09=09=09pipein.Close()
-=09=09=09pipeout.Close()
+=09=09=09buf :=3D new(bytes.Buffer)
+=09=09=09buf.ReadFrom(part.Body)
+=09=09=09defaults["Original"] =3D buf.String()
 =09=09=09addTab()
 =09=09})
+=09=09return nil
 =09} else {
-=09=09addTab()
+=09=09return addTab()
 =09}
-
-=09return nil
 }
=20
 func findPlaintext(bs *models.BodyStructure,
diff --git a/commands/msg/unsubscribe.go b/commands/msg/unsubscribe.go
index 15a9411c9c8f..5ffec4652056 100644
--- a/commands/msg/unsubscribe.go
+++ b/commands/msg/unsubscribe.go
@@ -87,13 +87,17 @@ func unsubscribeMailto(aerc *widgets.Aerc, u *url.URL) =
error {
 =09=09"To":      u.Opaque,
 =09=09"Subject": u.Query().Get("subject"),
 =09}
-=09composer :=3D widgets.NewComposer(
+=09composer, err :=3D widgets.NewComposer(
 =09=09aerc,
 =09=09aerc.Config(),
 =09=09acct.AccountConfig(),
 =09=09acct.Worker(),
+=09=09"",
 =09=09defaults,
 =09)
+=09if err !=3D nil {
+=09=09return err
+=09}
 =09composer.SetContents(strings.NewReader(u.Query().Get("body")))
 =09tab :=3D aerc.NewTab(composer, "unsubscribe")
 =09composer.OnHeaderChange("Subject", func(subject string) {
diff --git a/config/aerc.conf.in b/config/aerc.conf.in
index ec89ff7e9d26..16e3da117939 100644
--- a/config/aerc.conf.in
+++ b/config/aerc.conf.in
@@ -108,7 +108,7 @@ editor=3D
=20
 #
 # Default header fields to display when composing a message. To display
-# multiple headers in the same row, separate them with a pipe, e.g. "To|Fr=
om".=20
+# multiple headers in the same row, separate them with a pipe, e.g. "To|Fr=
om".
 #
 # Default: To|From,Subject
 header-layout=3DTo|From,Subject
@@ -139,3 +139,23 @@ text/*=3Dawk -f @SHAREDIR@/filters/plaintext
 #
 # Executed when a new email arrives in the selected folder
 new-email=3D
+
+[templates]
+# Templates are used to populate email bodies automatically.
+#
+
+# The directories where the templates are stored. It takes a colon-separat=
ed
+# list of directories.
+#
+# default: @SHAREDIR@/templates/
+template-dirs=3D@SHAREDIR@/templates/
+
+# The template to be used for quoted replies.
+#
+# default: quoted_reply
+quoted-reply=3Dquoted_reply
+
+# The template to be used for forward as body.
+#
+# default: forward_as_body
+forwards=3Dforward_as_body
diff --git a/config/config.go b/config/config.go
index 133a7f4ed5ca..97166de9c770 100644
--- a/config/config.go
+++ b/config/config.go
@@ -16,6 +16,8 @@ import (
 =09"github.com/gdamore/tcell"
 =09"github.com/go-ini/ini"
 =09"github.com/kyoh86/xdg"
+
+=09"git.sr.ht/~sircmpwn/aerc/lib/templates"
 )
=20
 type GeneralConfig struct {
@@ -98,16 +100,23 @@ type TriggersConfig struct {
 =09ExecuteCommand func(command []string) error
 }
=20
+type TemplateConfig struct {
+=09TemplateDirs []string
+=09QuotedReply  string   `ini:"quoted-reply"`
+=09Forwards     string   `ini:"forwards"`
+}
+
 type AercConfig struct {
-=09Bindings BindingConfig
-=09Compose  ComposeConfig
-=09Ini      *ini.File       `ini:"-"`
-=09Accounts []AccountConfig `ini:"-"`
-=09Filters  []FilterConfig  `ini:"-"`
-=09Viewer   ViewerConfig    `ini:"-"`
-=09Triggers TriggersConfig  `ini:"-"`
-=09Ui       UIConfig
-=09General  GeneralConfig
+=09Bindings  BindingConfig
+=09Compose   ComposeConfig
+=09Ini       *ini.File       `ini:"-"`
+=09Accounts  []AccountConfig `ini:"-"`
+=09Filters   []FilterConfig  `ini:"-"`
+=09Viewer    ViewerConfig    `ini:"-"`
+=09Triggers  TriggersConfig  `ini:"-"`
+=09Ui        UIConfig
+=09General   GeneralConfig
+=09Templates TemplateConfig
 }
=20
 // Input: TimestampFormat
@@ -305,6 +314,23 @@ func (config *AercConfig) LoadConfig(file *ini.File) e=
rror {
 =09=09=09return err
 =09=09}
 =09}
+=09if templatesSec, err :=3D file.GetSection("templates"); err =3D=3D nil =
{
+=09=09if err :=3D templatesSec.MapTo(&config.Templates); err !=3D nil {
+=09=09=09return err
+=09=09}
+=09=09templateDirs :=3D templatesSec.Key("template-dirs").String()
+=09=09config.Templates.TemplateDirs =3D strings.Split(templateDirs, ":")
+=09=09for key, val :=3D range templatesSec.KeysHash() {
+=09=09=09if key =3D=3D "template-dirs" {
+=09=09=09=09continue
+=09=09=09}
+=09=09=09_, err :=3D templates.ParseTemplateFromFile(
+=09=09=09=09val, config.Templates.TemplateDirs, templates.TestTemplateData=
())
+=09=09=09if err !=3D nil {
+=09=09=09=09return err
+=09=09=09}
+=09=09}
+=09}
 =09return nil
 }
=20
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index f4f02f2cb0f3..0cde160e9cdf 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -240,6 +240,31 @@ They are configured in the *[triggers]* section of aer=
c.conf.
 =09Format specifiers from *index-format* are expanded with respect to the =
new
 =09message.
=20
+## Templates
+
+Templates are used to populate the body of an email. The compose, reply
+and forward commands can be called with the -T flag with the name of the
+template name.
+
+aerc ships with some default templates installed in the share directory (u=
sually
+_/usr/share/aerc/templates_).
+
+*template-dirs*
+=09The directory where the templates are stored. The config takes a
+=09colon-separated list of dirs.
+
+=09Default: "/usr/share/aerc/templates"
+
+*quoted-reply*
+=09The template to be used for quoted replies.
+
+=09Default: "quoted_reply"
+
+*forwards*
+=09The template to be used for forward as body.
+
+=09Default: "forward_as_body"
+
 # ACCOUNTS.CONF
=20
 This file is used for configuring each mail account used for aerc. Each se=
ction
diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd
new file mode 100644
index 000000000000..8504a60a2c9b
--- /dev/null
+++ b/doc/aerc-templates.7.scd
@@ -0,0 +1,89 @@
+aerc-templates(7)
+
+# NAME
+
+aerc-templates - template file specification for *aerc*(1)
+
+# SYNOPSIS
+
+aerc uses the go "text/template" package for the template parsing
+which supports basic go lang operations.
+
+# MESSAGE DATA
+
+The following data can be used in templates. Though they are not all
+available always.
+
+*Addresses*
+=09An array of mail.Address. That can be used to add sender or recipient
+=09names to the template.
+
+=09- From: List of senders.
+=09- To: List of To recipients. Not always Available.
+=09- Cc: List of Cc recipients. Not always Available.
+=09- Bcc: List of Cc recipients. Not always Available.
+=09- OriginalFrom: List of senders of the original message.
+=09  Available for quoted reply and forward.
+
+=09Example:
+
+=09Get the name of the first sender.
+=09```
+=09{{(index .From 0).Name}}
+=09```
+
+=09Get the email address of the first sender
+=09```
+=09{{(index .From 0).Address}}
+=09```
+
+*Date and Time*
+=09The date and time information is always available and can be easily
+=09formated.
+
+=09- Date: Date and Time information when the compose window is opened.
+=09- OriginalDate: Date and Time when the original message of received.
+=09  Available for quoted reply and forward.
+
+=09The _dateFormat_ function can be used to format the date and time.
+
+=09Example:
+
+=09Format the date to go's time package format options.
+=09```
+=09{{dateFormat .Date "Mon Jan 2 15:04:05 -0700 MST 2006"}}
+=09```
+
+*Subject*
+=09The subject of the email is available for quoted reply and forward.
+
+=09Example:
+=09{{.Subject}}
+
+*Original Message*
+=09When using quoted reply or forward, the original message is available.
+=09It can be used using two functions that are available to templates.
+
+=09Example:
+
+=09_wrapText_ function can be used to wrap the original text to a number
+=09of characters per line.
+=09```
+=09{{wrapText .OriginalText 72}}
+=09```
+
+=09_quote_ function prepends each line with "> " and wraps the text to
+=0972 characters pre line.
+=09```
+=09{{quote .OriginalText}}
+=09```
+
+# SEE ALSO
+
+*aerc*(1) *aerc-config*(5)
+
+# AUTHORS
+
+Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
+source contributors. For more information about aerc development, see
+https://git.sr.ht/~sircmpwn/aerc.
diff --git a/lib/templates/template.go b/lib/templates/template.go
new file mode 100644
index 000000000000..e826711bf79a
--- /dev/null
+++ b/lib/templates/template.go
@@ -0,0 +1,160 @@
+package templates
+
+import (
+=09"bytes"
+=09"errors"
+=09"net/mail"
+=09"os"
+=09"path"
+=09"strings"
+=09"text/template"
+=09"time"
+
+=09"github.com/mitchellh/go-homedir"
+)
+
+type TemplateData struct {
+=09To              []*mail.Address
+=09Cc              []*mail.Address
+=09Bcc             []*mail.Address
+=09From            []*mail.Address
+=09Date            time.Time
+=09Subject         string
+=09// Only available when replying with a quote
+=09OriginalText    string
+=09OriginalFrom    []*mail.Address
+=09OriginalDate    time.Time
+}
+
+func TestTemplateData() TemplateData{
+=09defaults :=3D map[string]string {
+=09=09"To": "John Doe <john@example.com>",
+=09=09"Cc": "Josh Doe <josh@example.com>",
+=09=09"From": "Jane Smith <jane@example.com>",
+=09=09"Subject": "This is only a test",
+=09=09"OriginalText": "This is only a test text",
+=09=09"OriginalFrom": "John Doe <john@example.com>",
+=09=09"OriginalDate": time.Now().Format("Mon Jan 2, 2006 at 3:04 PM"),
+=09}
+
+=09return ParseTemplateData(defaults)
+}
+
+func ParseTemplateData(defaults map[string]string) TemplateData {
+=09originalDate, _ :=3D time.Parse("Mon Jan 2, 2006 at 3:04 PM", defaults[=
"OriginalDate"])
+=09td :=3D TemplateData {
+=09=09To: parseAddressList(defaults["To"]),
+=09=09Cc: parseAddressList(defaults["Cc"]),
+=09=09Bcc: parseAddressList(defaults["Bcc"]),
+=09=09From: parseAddressList(defaults["From"]),
+=09=09Date: time.Now(),
+=09=09Subject: defaults["Subject"],
+=09=09OriginalText: defaults["Original"],
+=09=09OriginalFrom: parseAddressList(defaults["OriginalFrom"]),
+=09=09OriginalDate: originalDate,
+=09}
+=09return td
+}
+
+func parseAddressList(list string) []*mail.Address {
+=09addrs, err :=3D mail.ParseAddressList(list)
+=09if err !=3D nil {
+=09=09return nil
+=09}
+
+=09return addrs
+}
+
+func wrapLine(text string, lineWidth int) string {
+=09words :=3D strings.Fields(text)
+=09if len(words) =3D=3D 0 {
+=09=09return text
+=09}
+=09wrapped :=3D words[0]
+=09spaceLeft :=3D lineWidth - len(wrapped)
+=09for _, word :=3D range words[1:] {
+=09=09if len(word)+1 > spaceLeft {
+=09=09=09wrapped +=3D "\n" + word
+=09=09=09spaceLeft =3D lineWidth - len(word)
+=09=09} else {
+=09=09=09wrapped +=3D " " + word
+=09=09=09spaceLeft -=3D 1 + len(word)
+=09=09}
+=09}
+
+=09return wrapped
+}
+
+func wrapText(text string, lineWidth int) string {
+=09text =3D strings.ReplaceAll(text, "\r\n", "\n")
+=09lines :=3D strings.Split(text, "\n")
+=09var wrapped string
+
+=09for _, line :=3D range lines {
+=09=09wrapped +=3D wrapLine(line, lineWidth) + "\n"
+=09}
+=09return wrapped
+}
+
+// Wraping lines at 70 so that with the "> " of the quote it is under 72
+func quote(text string) string {
+=09text =3D strings.ReplaceAll(text, "\r\n", "\n")
+
+=09quoted :=3D "> " + wrapText(text, 70)
+=09quoted =3D strings.ReplaceAll(quoted, "\n", "\n> ")
+=09return quoted
+}
+
+var templateFuncs =3D template.FuncMap{
+=09"quote": quote,
+=09"wrapText": wrapText,
+=09"dateFormat": time.Time.Format,
+}
+
+func findTemplate(templateName string, templateDirs []string) (string, err=
or) {
+=09for _, dir :=3D range templateDirs {
+=09=09templateFile, err :=3D homedir.Expand(path.Join(dir, templateName))
+=09=09if err !=3D nil {
+=09=09=09return "", err
+=09=09}
+
+=09=09if _, err :=3D os.Stat(templateFile); os.IsNotExist(err) {
+=09=09=09continue
+=09=09}
+=09=09return templateFile, nil
+=09}
+
+=09return "", errors.New("Can't find template - " + templateName)
+}
+
+func ParseTemplateFromFile(templateName string, templateDirs []string, dat=
a interface{})  ([]byte, error) {
+=09templateFile, err :=3D findTemplate(templateName, templateDirs)
+=09if err !=3D nil {
+=09=09return nil, err
+=09}
+=09emailTemplate, err :=3D
+=09=09template.New(templateName).Funcs(templateFuncs).ParseFiles(templateF=
ile)
+=09if err !=3D nil {
+=09=09return nil, err
+=09}
+
+=09var outString bytes.Buffer
+=09if err :=3D emailTemplate.Execute(&outString, data); err !=3D nil {
+=09=09return nil, err
+=09}
+=09return outString.Bytes(), nil
+}
+
+func ParseTemplate(templateText string, data interface{})  ([]byte, error)=
 {
+=09emailTemplate, err :=3D
+=09=09template.New("email_template").Funcs(templateFuncs).Parse(templateTe=
xt)
+=09if err !=3D nil {
+=09=09return nil, err
+=09}
+
+=09var outString bytes.Buffer
+=09if err :=3D emailTemplate.Execute(&outString, data); err !=3D nil {
+=09=09return nil, err
+=09}
+=09return outString.Bytes(), nil
+}
diff --git a/templates/forward_as_body b/templates/forward_as_body
new file mode 100644
index 000000000000..a487224ff3c0
--- /dev/null
+++ b/templates/forward_as_body
@@ -0,0 +1,2 @@
+Forwarded message from {{(index .OriginalFrom 0).Name}} on {{dateFormat .O=
riginalDate "Mon Jan 2, 2006 at 3:04 PM"}}:
+{{wrapText .OriginalText 72}}
diff --git a/templates/quoted_reply b/templates/quoted_reply
new file mode 100644
index 000000000000..ee4e1f7ef5f5
--- /dev/null
+++ b/templates/quoted_reply
@@ -0,0 +1,2 @@
+on {{dateFormat .OriginalDate "Mon Jan 2, 2006 at 3:04 PM"}}, {{(index .Or=
iginalFrom 0).Name}} wrote:
+{{quote .OriginalText}}
diff --git a/widgets/aerc.go b/widgets/aerc.go
index af51a0f4d3db..d324908b58a5 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -431,8 +431,11 @@ func (aerc *Aerc) Mailto(addr *url.URL) error {
 =09=09=09defaults[header] =3D strings.Join(vals, ",")
 =09=09}
 =09}
-=09composer :=3D NewComposer(aerc, aerc.Config(),
-=09=09acct.AccountConfig(), acct.Worker(), defaults)
+=09composer, err :=3D NewComposer(aerc, aerc.Config(),
+=09=09acct.AccountConfig(), acct.Worker(), "", defaults)
+=09if err !=3D nil {
+=09=09return nil
+=09}
 =09composer.FocusSubject()
 =09title :=3D "New email"
 =09if subj, ok :=3D defaults["Subject"]; ok {
diff --git a/widgets/compose.go b/widgets/compose.go
index 22c58da52ca1..a55d147feab9 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -23,6 +23,7 @@ import (
 =09"github.com/pkg/errors"
=20
 =09"git.sr.ht/~sircmpwn/aerc/config"
+=09"git.sr.ht/~sircmpwn/aerc/lib/templates"
 =09"git.sr.ht/~sircmpwn/aerc/lib/ui"
 =09"git.sr.ht/~sircmpwn/aerc/worker/types"
 )
@@ -53,7 +54,7 @@ type Composer struct {
 }
=20
 func NewComposer(aerc *Aerc, conf *config.AercConfig,
-=09acct *config.AccountConfig, worker *types.Worker, defaults map[string]s=
tring) *Composer {
+=09acct *config.AccountConfig, worker *types.Worker, template string, defa=
ults map[string]string) (*Composer, error) {
=20
 =09if defaults =3D=3D nil {
 =09=09defaults =3D make(map[string]string)
@@ -62,13 +63,14 @@ func NewComposer(aerc *Aerc, conf *config.AercConfig,
 =09=09defaults["From"] =3D acct.From
 =09}
=20
+=09templateData :=3D templates.ParseTemplateData(defaults)
 =09layout, editors, focusable :=3D buildComposeHeader(
 =09=09conf.Compose.HeaderLayout, defaults)
=20
 =09email, err :=3D ioutil.TempFile("", "aerc-compose-*.eml")
 =09if err !=3D nil {
 =09=09// TODO: handle this better
-=09=09return nil
+=09=09return nil, err
 =09}
=20
 =09c :=3D &Composer{
@@ -86,11 +88,14 @@ func NewComposer(aerc *Aerc, conf *config.AercConfig,
 =09}
=20
 =09c.AddSignature()
+=09if err :=3D c.AddTemplate(template, templateData); err !=3D nil {
+=09=09return nil, err
+=09}
=20
 =09c.updateGrid()
 =09c.ShowTerminal()
=20
-=09return c
+=09return c, nil
 }
=20
 func buildComposeHeader(layout HeaderLayout, defaults map[string]string) (
@@ -163,6 +168,32 @@ func (c *Composer) AppendContents(reader io.Reader) {
 =09c.email.Sync()
 }
=20
+func (c *Composer) AddTemplate(template string, data interface{}) error {
+=09if template =3D=3D "" {
+=09=09return nil
+=09}
+
+=09templateText, err :=3D templates.ParseTemplateFromFile(template, c.conf=
ig.Templates.TemplateDirs, data)
+=09if err !=3D nil {
+=09=09return err
+=09}
+=09c.PrependContents(bytes.NewReader(templateText))
+=09return nil
+}
+
+func (c *Composer) AddTemplateFromString(template string, data interface{}=
) error {
+=09if template =3D=3D "" {
+=09=09return nil
+=09}
+
+=09templateText, err :=3D templates.ParseTemplate(template, data)
+=09if err !=3D nil {
+=09=09return err
+=09}
+=09c.PrependContents(bytes.NewReader(templateText))
+=09return nil
+}
+
 func (c *Composer) AddSignature() {
 =09var signature []byte
 =09if c.acct.SignatureCmd !=3D "" {
--=20
2.23.0