diff options
| -rw-r--r-- | doc/aerc.1.scd | 2 | ||||
| -rw-r--r-- | widgets/aerc.go | 19 |
2 files changed, 16 insertions, 5 deletions
diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd index ea3897bc..17e25c2a 100644 --- a/doc/aerc.1.scd +++ b/doc/aerc.1.scd @@ -35,6 +35,8 @@ from your terminal. : BCC header will be completed with the list of addresses | in-reply-to=<\<message-id\>> : In-reply-to header will be set to the message id +| account=<accountname> +: Specify the account (must be in accounts.conf; default is the selected account) Note that reserved characters in the queries must be percent encoded. diff --git a/widgets/aerc.go b/widgets/aerc.go index 90e7a9e5..fb80c391 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -532,13 +532,9 @@ func (aerc *Aerc) RegisterChoices(choices []Choice) { } func (aerc *Aerc) Mailto(addr *url.URL) error { - acct := aerc.SelectedAccount() - if acct == nil { - return errors.New("No account selected") - } - var subject string var body string + var acctName string h := &mail.Header{} to, err := mail.ParseAddressList(addr.Opaque) if err != nil && addr.Opaque != "" { @@ -547,6 +543,8 @@ func (aerc *Aerc) Mailto(addr *url.URL) error { h.SetAddressList("to", to) for key, vals := range addr.Query() { switch strings.ToLower(key) { + case "account": + acctName = strings.Join(vals, "") case "bcc": list, err := mail.ParseAddressList(strings.Join(vals, ",")) if err != nil { @@ -578,6 +576,17 @@ func (aerc *Aerc) Mailto(addr *url.URL) error { } } + acct := aerc.SelectedAccount() + if acctName != "" { + if a, ok := aerc.accounts[acctName]; ok && a != nil { + acct = a + } + } + + if acct == nil { + return errors.New("No account selected") + } + composer, err := NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(), acct.Worker(), "", h, models.OriginalMail{}) if err != nil { |