7 files changed, 9 insertions, 9 deletions
diff --git a/commands/msgview/close.go b/commands/msgview/close.go
index 37f66ad..1fed0b7 100644
--- a/commands/msgview/close.go
+++ b/commands/msgview/close.go
@@ -24,7 +24,7 @@ func (Close) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) != 1 {
 		return errors.New("Usage: close")
 	}
-	mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	mv.Close()
 	aerc.RemoveTab(mv)
 	return nil
diff --git a/commands/msgview/next-part.go b/commands/msgview/next-part.go
index f44ffab..652dccb 100644
--- a/commands/msgview/next-part.go
+++ b/commands/msgview/next-part.go
@@ -35,7 +35,7 @@ func (NextPrevPart) Execute(aerc *widgets.Aerc, args []string) error {
 			return nextPrevPartUsage(args[0])
 		}
 	}
-	mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	for ; n > 0; n-- {
 		if args[0] == "prev-part" {
 			mv.PreviousPart()
diff --git a/commands/msgview/next.go b/commands/msgview/next.go
index 928b9fb..c80e0ab 100644
--- a/commands/msgview/next.go
+++ b/commands/msgview/next.go
@@ -27,7 +27,7 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
 	if err != nil {
 		return err
 	}
-	mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	acct := mv.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
diff --git a/commands/msgview/open.go b/commands/msgview/open.go
index 7615e9a..05a3c63 100644
--- a/commands/msgview/open.go
+++ b/commands/msgview/open.go
@@ -25,7 +25,7 @@ func (Open) Aliases() []string {
 }
 
 func (Open) Complete(aerc *widgets.Aerc, args []string) []string {
-	mv := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	if mv != nil {
 		if p := mv.SelectedMessagePart(); p != nil {
 			return commands.CompletionFromList(aerc, p.Links, args)
@@ -35,7 +35,7 @@ func (Open) Complete(aerc *widgets.Aerc, args []string) []string {
 }
 
 func (Open) Execute(aerc *widgets.Aerc, args []string) error {
-	mv := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	p := mv.SelectedMessagePart()
 
 	if args[0] == "open-link" && len(args) > 1 {
diff --git a/commands/msgview/save.go b/commands/msgview/save.go
index 8aedd42..f27a68c 100644
--- a/commands/msgview/save.go
+++ b/commands/msgview/save.go
@@ -99,9 +99,9 @@ func (Save) Execute(aerc *widgets.Aerc, args []string) error {
 		return err
 	}
 
-	mv, ok := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv, ok := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	if !ok {
-		return fmt.Errorf("SelectedTab is not a MessageViewer")
+		return fmt.Errorf("SelectedTabContent is not a MessageViewer")
 	}
 
 	if params.attachments {
diff --git a/commands/msgview/toggle-headers.go b/commands/msgview/toggle-headers.go
index 75f7e46..1a59349 100644
--- a/commands/msgview/toggle-headers.go
+++ b/commands/msgview/toggle-headers.go
@@ -24,7 +24,7 @@ func (ToggleHeaders) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) > 1 {
 		return toggleHeadersUsage(args[0])
 	}
-	mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	mv.ToggleHeaders()
 	return nil
 }
diff --git a/commands/msgview/toggle-key-passthrough.go b/commands/msgview/toggle-key-passthrough.go
index 1ac370e..cbc4565 100644
--- a/commands/msgview/toggle-key-passthrough.go
+++ b/commands/msgview/toggle-key-passthrough.go
@@ -25,7 +25,7 @@ func (ToggleKeyPassthrough) Execute(aerc *widgets.Aerc, args []string) error {
 	if len(args) != 1 {
 		return errors.New("Usage: toggle-key-passthrough")
 	}
-	mv, _ := aerc.SelectedTab().(*widgets.MessageViewer)
+	mv, _ := aerc.SelectedTabContent().(*widgets.MessageViewer)
 	keyPassthroughEnabled := mv.ToggleKeyPassthrough()
 	if acct := mv.SelectedAccount(); acct != nil {
 		acct.SetStatus(statusline.Passthrough(keyPassthroughEnabled))