5 files changed, 12 insertions, 7 deletions
diff --git a/commands/account/compose.go b/commands/account/compose.go
index fc7617ec..16474b4c 100644
--- a/commands/account/compose.go
+++ b/commands/account/compose.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/emersion/go-message/mail"
 
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
 	"git.sr.ht/~rjarry/aerc/widgets"
@@ -64,7 +65,7 @@ func (Compose) Execute(aerc *widgets.Aerc, args []string) error {
 		} else {
 			tab.Name = subject
 		}
-		tab.Content.Invalidate()
+		ui.Invalidate()
 	})
 	go func() {
 		defer logging.PanicHandler()
diff --git a/commands/account/next-result.go b/commands/account/next-result.go
index daa7af3c..922f95a1 100644
--- a/commands/account/next-result.go
+++ b/commands/account/next-result.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
@@ -34,13 +35,13 @@ func (NextPrevResult) Execute(aerc *widgets.Aerc, args []string) error {
 		if store != nil {
 			store.PrevResult()
 		}
-		acct.Messages().Invalidate()
+		ui.Invalidate()
 	} else {
 		store := acct.Store()
 		if store != nil {
 			store.NextResult()
 		}
-		acct.Messages().Invalidate()
+		ui.Invalidate()
 	}
 	return nil
 }
diff --git a/commands/account/next.go b/commands/account/next.go
index c9c26809..15dc5363 100644
--- a/commands/account/next.go
+++ b/commands/account/next.go
@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"strings"
 
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 	"git.sr.ht/~rjarry/aerc/widgets"
 )
 
@@ -65,13 +66,13 @@ func ExecuteNextPrevMessage(args []string, acct *widgets.AccountView, pct bool,
 		store := acct.Store()
 		if store != nil {
 			store.NextPrev(-n)
-			acct.Messages().Invalidate()
+			ui.Invalidate()
 		}
 	} else {
 		store := acct.Store()
 		if store != nil {
 			store.NextPrev(n)
-			acct.Messages().Invalidate()
+			ui.Invalidate()
 		}
 	}
 	return nil
diff --git a/commands/account/recover.go b/commands/account/recover.go
index 682a99c5..b8acd261 100644
--- a/commands/account/recover.go
+++ b/commands/account/recover.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 
 	"git.sr.ht/~rjarry/aerc/commands"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/models"
 	"git.sr.ht/~rjarry/aerc/widgets"
@@ -110,7 +111,7 @@ func (Recover) Execute(aerc *widgets.Aerc, args []string) error {
 	tab := aerc.NewTab(composer, "Recovered")
 	composer.OnHeaderChange("Subject", func(subject string) {
 		tab.Name = subject
-		tab.Content.Invalidate()
+		ui.Invalidate()
 	})
 	go func() {
 		defer logging.PanicHandler()
diff --git a/commands/account/search.go b/commands/account/search.go
index 82099249..b4942bf5 100644
--- a/commands/account/search.go
+++ b/commands/account/search.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"git.sr.ht/~rjarry/aerc/lib/statusline"
+	"git.sr.ht/~rjarry/aerc/lib/ui"
 	"git.sr.ht/~rjarry/aerc/logging"
 	"git.sr.ht/~rjarry/aerc/widgets"
 	"git.sr.ht/~rjarry/aerc/worker/types"
@@ -54,7 +55,7 @@ func (SearchFilter) Execute(aerc *widgets.Aerc, args []string) error {
 			logging.Infof("Search results: %v", uids)
 			store.ApplySearch(uids)
 			// TODO: Remove when stores have multiple OnUpdate handlers
-			acct.Messages().Invalidate()
+			ui.Invalidate()
 		}
 		store.Search(args, cb)
 	}