aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/aerc.go19
1 files changed, 14 insertions, 5 deletions
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 {