widgets: rename package to app

This is the central point of all aerc. Having it named widgets is
confusing. Rename it to app. It will make a cleaner transition when
making the app.Aerc object available globally in the next commit.

Signed-off-by: Robin Jarry <robin@jarry.cc>
Acked-by: Moritz Poldrack <moritz@poldrack.dev>

19 files changed, 64 insertions, 64 deletions

diff --git a/commands/account/cf.go b/commands/account/cf.go
index f0fa3b67..38841474 100644
--- a/commands/account/cf.go
+++ b/commands/account/cf.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"strings"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/lib/state"
-	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 var history map[string]string
@@ -22,11 +22,11 @@ func (ChangeFolder) Aliases() []string {
 	return []string{"cf"}
 }
 
-func (ChangeFolder) Complete(aerc *widgets.Aerc, args []string) []string {
+func (ChangeFolder) Complete(aerc *app.Aerc, args []string) []string {
 	return commands.GetFolders(aerc, args)
 }
 
-func (ChangeFolder) Execute(aerc *widgets.Aerc, args []string) error {
+func (ChangeFolder) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) == 1 {
 		return errors.New("Usage: cf <folder>")
 	}
diff --git a/commands/account/check-mail.go b/commands/account/check-mail.go
index eb57c0c0..2b6a06f9 100644
--- a/commands/account/check-mail.go
+++ b/commands/account/check-mail.go
@@ -3,7 +3,7 @@ package account
 import (
 	"errors"
 
-	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/app"
 )
 
 type CheckMail struct{}
@@ -16,11 +16,11 @@ func (CheckMail) Aliases() []string {
 	return []string{"check-mail"}
 }
 
-func (CheckMail) Complete(aerc *widgets.Aerc, args []string) []string {
+func (CheckMail) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (CheckMail) Execute(aerc *widgets.Aerc, args []string) error {
+func (CheckMail) Execute(aerc *app.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/account/clear.go b/commands/account/clear.go
index a383b621..547c26c4 100644
--- a/commands/account/clear.go
+++ b/commands/account/clear.go
@@ -3,8 +3,8 @@ package account
 import (
 	"errors"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/lib/state"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
@@ -18,11 +18,11 @@ func (Clear) Aliases() []string {
 	return []string{"clear"}
 }
 
-func (Clear) Complete(aerc *widgets.Aerc, args []string) []string {
+func (Clear) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (Clear) Execute(aerc *widgets.Aerc, args []string) error {
+func (Clear) Execute(aerc *app.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/account/compose.go b/commands/account/compose.go
index 5da0f163..e2812251 100644
--- a/commands/account/compose.go
+++ b/commands/account/compose.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/emersion/go-message/mail"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/config"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
@@ -25,11 +25,11 @@ func (Compose) Aliases() []string {
 	return []string{"compose"}
 }
 
-func (Compose) Complete(aerc *widgets.Aerc, args []string) []string {
+func (Compose) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (Compose) Execute(aerc *widgets.Aerc, args []string) error {
+func (Compose) Execute(aerc *app.Aerc, args []string) error {
 	body, template, editHeaders, err := buildBody(args)
 	if err != nil {
 		return err
@@ -50,7 +50,7 @@ func (Compose) Execute(aerc *widgets.Aerc, args []string) error {
 	}
 	headers := mail.HeaderFromMap(msg.Header)
 
-	composer, err := widgets.NewComposer(aerc, acct,
+	composer, err := app.NewComposer(aerc, acct,
 		acct.AccountConfig(), acct.Worker(), editHeaders,
 		template, &headers, nil, msg.Body)
 	if err != nil {
diff --git a/commands/account/connection.go b/commands/account/connection.go
index 0a67b2fe..2704d9bb 100644
--- a/commands/account/connection.go
+++ b/commands/account/connection.go
@@ -3,8 +3,8 @@ package account
 import (
 	"errors"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/lib/state"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -18,11 +18,11 @@ func (Connection) Aliases() []string {
 	return []string{"connect", "disconnect"}
 }
 
-func (Connection) Complete(aerc *widgets.Aerc, args []string) []string {
+func (Connection) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (Connection) Execute(aerc *widgets.Aerc, args []string) error {
+func (Connection) Execute(aerc *app.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/account/expand-folder.go b/commands/account/expand-folder.go
index 3eafaa09..8a7a8e93 100644
--- a/commands/account/expand-folder.go
+++ b/commands/account/expand-folder.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/app"
 )
 
 type ExpandCollapseFolder struct{}
@@ -17,11 +17,11 @@ func (ExpandCollapseFolder) Aliases() []string {
 	return []string{"expand-folder", "collapse-folder"}
 }
 
-func (ExpandCollapseFolder) Complete(aerc *widgets.Aerc, args []string) []string {
+func (ExpandCollapseFolder) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (ExpandCollapseFolder) Execute(aerc *widgets.Aerc, args []string) error {
+func (ExpandCollapseFolder) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) > 1 {
 		return expandCollapseFolderUsage(args[0])
 	}
diff --git a/commands/account/export-mbox.go b/commands/account/export-mbox.go
index 8981261b..c227bdf9 100644
--- a/commands/account/export-mbox.go
+++ b/commands/account/export-mbox.go
@@ -8,9 +8,9 @@ import (
 	"sync"
 	"time"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/log"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	mboxer "git.sr.ht/~rjarry/aerc/worker/mbox"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
@@ -25,11 +25,11 @@ func (ExportMbox) Aliases() []string {
 	return []string{"export-mbox"}
 }
 
-func (ExportMbox) Complete(aerc *widgets.Aerc, args []string) []string {
+func (ExportMbox) Complete(aerc *app.Aerc, args []string) []string {
 	return commands.CompletePath(filepath.Join(args...))
 }
 
-func (ExportMbox) Execute(aerc *widgets.Aerc, args []string) error {
+func (ExportMbox) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) != 2 {
 		return exportFolderUsage(args[0])
 	}
@@ -59,7 +59,7 @@ func (ExportMbox) Execute(aerc *widgets.Aerc, args []string) error {
 	var uids []uint32
 
 	// check if something is marked - we export that then
-	msgProvider, ok := aerc.SelectedTabContent().(widgets.ProvidesMessages)
+	msgProvider, ok := aerc.SelectedTabContent().(app.ProvidesMessages)
 	if !ok {
 		msgProvider = aerc.SelectedAccount()
 	}
diff --git a/commands/account/import-mbox.go b/commands/account/import-mbox.go
index 85e9a341..2a441737 100644
--- a/commands/account/import-mbox.go
+++ b/commands/account/import-mbox.go
@@ -10,10 +10,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/log"
 	"git.sr.ht/~rjarry/aerc/models"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	mboxer "git.sr.ht/~rjarry/aerc/worker/mbox"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
@@ -28,11 +28,11 @@ func (ImportMbox) Aliases() []string {
 	return []string{"import-mbox"}
 }
 
-func (ImportMbox) Complete(aerc *widgets.Aerc, args []string) []string {
+func (ImportMbox) Complete(aerc *app.Aerc, args []string) []string {
 	return commands.CompletePath(filepath.Join(args...))
 }
 
-func (ImportMbox) Execute(aerc *widgets.Aerc, args []string) error {
+func (ImportMbox) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) != 2 {
 		return importFolderUsage(args[0])
 	}
@@ -129,7 +129,7 @@ func (ImportMbox) Execute(aerc *widgets.Aerc, args []string) error {
 	}
 
 	if len(store.Uids()) > 0 {
-		confirm := widgets.NewSelectorDialog(
+		confirm := app.NewSelectorDialog(
 			"Selected directory is not empty",
 			fmt.Sprintf("Import mbox file to %s anyways?", folder),
 			[]string{"No", "Yes"}, 0, aerc.SelectedAccountUiConfig(),
diff --git a/commands/account/mkdir.go b/commands/account/mkdir.go
index 02d997e4..79e0a4fa 100644
--- a/commands/account/mkdir.go
+++ b/commands/account/mkdir.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -19,7 +19,7 @@ func (MakeDir) Aliases() []string {
 	return []string{"mkdir"}
 }
 
-func (MakeDir) Complete(aerc *widgets.Aerc, args []string) []string {
+func (MakeDir) Complete(aerc *app.Aerc, args []string) []string {
 	if len(args) == 0 {
 		return nil
 	}
@@ -41,7 +41,7 @@ func (MakeDir) Complete(aerc *widgets.Aerc, args []string) []string {
 	return inboxes
 }
 
-func (MakeDir) Execute(aerc *widgets.Aerc, args []string) error {
+func (MakeDir) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) == 0 {
 		return errors.New("Usage: :mkdir <name>")
 	}
diff --git a/commands/account/next-folder.go b/commands/account/next-folder.go
index e3541e52..b0657ff1 100644
--- a/commands/account/next-folder.go
+++ b/commands/account/next-folder.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/app"
 )
 
 type NextPrevFolder struct{}
@@ -18,11 +18,11 @@ func (NextPrevFolder) Aliases() []string {
 	return []string{"next-folder", "prev-folder"}
 }
 
-func (NextPrevFolder) Complete(aerc *widgets.Aerc, args []string) []string {
+func (NextPrevFolder) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (NextPrevFolder) Execute(aerc *widgets.Aerc, args []string) error {
+func (NextPrevFolder) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) > 2 {
 		return nextPrevFolderUsage(args[0])
 	}
diff --git a/commands/account/next-result.go b/commands/account/next-result.go
index 922f95a1..06478f0c 100644
--- a/commands/account/next-result.go
+++ b/commands/account/next-result.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/lib/ui"
-	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevResult struct{}
@@ -18,11 +18,11 @@ func (NextPrevResult) Aliases() []string {
 	return []string{"next-result", "prev-result"}
 }
 
-func (NextPrevResult) Complete(aerc *widgets.Aerc, args []string) []string {
+func (NextPrevResult) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (NextPrevResult) Execute(aerc *widgets.Aerc, args []string) error {
+func (NextPrevResult) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) > 1 {
 		return nextPrevResultUsage(args[0])
 	}
diff --git a/commands/account/next.go b/commands/account/next.go
index 15dc5363..224534b9 100644
--- a/commands/account/next.go
+++ b/commands/account/next.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/lib/ui"
-	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
 type NextPrevMsg struct{}
@@ -20,11 +20,11 @@ func (NextPrevMsg) Aliases() []string {
 	return []string{"next", "next-message", "prev", "prev-message"}
 }
 
-func (NextPrevMsg) Complete(aerc *widgets.Aerc, args []string) []string {
+func (NextPrevMsg) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
+func (NextPrevMsg) Execute(aerc *app.Aerc, args []string) error {
 	n, pct, err := ParseNextPrevMessage(args)
 	if err != nil {
 		return err
@@ -58,7 +58,7 @@ func ParseNextPrevMessage(args []string) (int, bool, error) {
 	return n, pct, nil
 }
 
-func ExecuteNextPrevMessage(args []string, acct *widgets.AccountView, pct bool, n int) error {
+func ExecuteNextPrevMessage(args []string, acct *app.AccountView, pct bool, n int) error {
 	if pct {
 		n = int(float64(acct.Messages().Height()) * (float64(n) / 100.0))
 	}
diff --git a/commands/account/recover.go b/commands/account/recover.go
index 9fdaa3e9..1bb1aceb 100644
--- a/commands/account/recover.go
+++ b/commands/account/recover.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"path/filepath"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/config"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
@@ -27,7 +27,7 @@ func (Recover) Options() string {
 	return "feE"
 }
 
-func (r Recover) Complete(aerc *widgets.Aerc, args []string) []string {
+func (r Recover) Complete(aerc *app.Aerc, args []string) []string {
 	// file name of temp file is hard-coded in the NewComposer() function
 	files, err := filepath.Glob(
 		filepath.Join(os.TempDir(), "aerc-compose-*.eml"),
@@ -39,7 +39,7 @@ func (r Recover) Complete(aerc *widgets.Aerc, args []string) []string {
 		commands.Operands(args, r.Options()))
 }
 
-func (r Recover) Execute(aerc *widgets.Aerc, args []string) error {
+func (r Recover) Execute(aerc *app.Aerc, args []string) error {
 	// Complete() expects to be passed only the arguments, not including the command name
 	if len(Recover{}.Complete(aerc, args[1:])) == 0 {
 		return errors.New("No messages to recover.")
@@ -89,7 +89,7 @@ func (r Recover) Execute(aerc *widgets.Aerc, args []string) error {
 		return err
 	}
 
-	composer, err := widgets.NewComposer(aerc, acct,
+	composer, err := app.NewComposer(aerc, acct,
 		acct.AccountConfig(), acct.Worker(), editHeaders,
 		"", nil, nil, bytes.NewReader(data))
 	if err != nil {
diff --git a/commands/account/rmdir.go b/commands/account/rmdir.go
index 9f6fedeb..eca8b59f 100644
--- a/commands/account/rmdir.go
+++ b/commands/account/rmdir.go
@@ -6,7 +6,7 @@ import (
 
 	"git.sr.ht/~sircmpwn/getopt"
 
-	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -20,11 +20,11 @@ func (RemoveDir) Aliases() []string {
 	return []string{"rmdir"}
 }
 
-func (RemoveDir) Complete(aerc *widgets.Aerc, args []string) []string {
+func (RemoveDir) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (RemoveDir) Execute(aerc *widgets.Aerc, args []string) error {
+func (RemoveDir) Execute(aerc *app.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/account/search.go b/commands/account/search.go
index d7884f15..04f7ddc3 100644
--- a/commands/account/search.go
+++ b/commands/account/search.go
@@ -4,11 +4,11 @@ import (
 	"errors"
 	"strings"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/lib/state"
 	"git.sr.ht/~rjarry/aerc/lib/ui"
 	"git.sr.ht/~rjarry/aerc/log"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -27,7 +27,7 @@ func (SearchFilter) Aliases() []string {
 }
 
 func (s SearchFilter) CompleteOption(
-	aerc *widgets.Aerc,
+	aerc *app.Aerc,
 	r rune,
 	search string,
 ) []string {
@@ -44,11 +44,11 @@ func (s SearchFilter) CompleteOption(
 	return commands.CompletionFromList(aerc, valid, []string{search})
 }
 
-func (SearchFilter) Complete(aerc *widgets.Aerc, args []string) []string {
+func (SearchFilter) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (SearchFilter) Execute(aerc *widgets.Aerc, args []string) error {
+func (SearchFilter) Execute(aerc *app.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/account/select.go b/commands/account/select.go
index 28aedfa5..aeb584f4 100644
--- a/commands/account/select.go
+++ b/commands/account/select.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strconv"
 
-	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/app"
 )
 
 type SelectMessage struct{}
@@ -17,11 +17,11 @@ func (SelectMessage) Aliases() []string {
 	return []string{"select", "select-message"}
 }
 
-func (SelectMessage) Complete(aerc *widgets.Aerc, args []string) []string {
+func (SelectMessage) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (SelectMessage) Execute(aerc *widgets.Aerc, args []string) error {
+func (SelectMessage) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) != 2 {
 		return errors.New("Usage: :select-message <n>")
 	}
diff --git a/commands/account/sort.go b/commands/account/sort.go
index cabe10ec..8624ff12 100644
--- a/commands/account/sort.go
+++ b/commands/account/sort.go
@@ -4,10 +4,10 @@ import (
 	"errors"
 	"strings"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/lib/sort"
 	"git.sr.ht/~rjarry/aerc/lib/state"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~rjarry/aerc/worker/types"
 )
 
@@ -21,7 +21,7 @@ func (Sort) Aliases() []string {
 	return []string{"sort"}
 }
 
-func (Sort) Complete(aerc *widgets.Aerc, args []string) []string {
+func (Sort) Complete(aerc *app.Aerc, args []string) []string {
 	supportedCriteria := []string{
 		"arrival",
 		"cc",
@@ -62,7 +62,7 @@ func (Sort) Complete(aerc *widgets.Aerc, args []string) []string {
 	return completions
 }
 
-func (Sort) Execute(aerc *widgets.Aerc, args []string) error {
+func (Sort) Execute(aerc *app.Aerc, args []string) error {
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected.")
diff --git a/commands/account/split.go b/commands/account/split.go
index 7a5acc47..82870d60 100644
--- a/commands/account/split.go
+++ b/commands/account/split.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.sr.ht/~rjarry/aerc/widgets"
+	"git.sr.ht/~rjarry/aerc/app"
 )
 
 type Split struct{}
@@ -18,11 +18,11 @@ func (Split) Aliases() []string {
 	return []string{"split", "vsplit"}
 }
 
-func (Split) Complete(aerc *widgets.Aerc, args []string) []string {
+func (Split) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (Split) Execute(aerc *widgets.Aerc, args []string) error {
+func (Split) Execute(aerc *app.Aerc, args []string) error {
 	if len(args) > 2 {
 		return errors.New("Usage: [v]split n")
 	}
diff --git a/commands/account/view.go b/commands/account/view.go
index f48d3bc3..cbf2ce3f 100644
--- a/commands/account/view.go
+++ b/commands/account/view.go
@@ -3,8 +3,8 @@ package account
 import (
 	"errors"
 
+	"git.sr.ht/~rjarry/aerc/app"
 	"git.sr.ht/~rjarry/aerc/lib"
-	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~sircmpwn/getopt"
 )
 
@@ -18,11 +18,11 @@ func (ViewMessage) Aliases() []string {
 	return []string{"view-message", "view"}
 }
 
-func (ViewMessage) Complete(aerc *widgets.Aerc, args []string) []string {
+func (ViewMessage) Complete(aerc *app.Aerc, args []string) []string {
 	return nil
 }
 
-func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error {
+func (ViewMessage) Execute(aerc *app.Aerc, args []string) error {
 	peek := false
 	opts, optind, err := getopt.Getopts(args, "p")
 	if err != nil {
@@ -65,7 +65,7 @@ func (ViewMessage) Execute(aerc *widgets.Aerc, args []string) error {
 				aerc.PushError(err.Error())
 				return
 			}
-			viewer := widgets.NewMessageViewer(acct, view)
+			viewer := app.NewMessageViewer(acct, view)
 			aerc.NewTab(viewer, msg.Envelope.Subject)
 		})
 	return nil