diff --git a/commands/compose/switch.go b/commands/compose/switch.go
new file mode 100644
index 0000000..5109ee0
--- /dev/null
+++ b/commands/compose/switch.go
@@ -0,0 +1,47 @@
+package compose
+
+import (
+	"errors"
+	"fmt"
+
+	"git.sr.ht/~rjarry/aerc/widgets"
+)
+
+type AccountSwitcher interface {
+	SwitchAccount(*widgets.AccountView) error
+}
+
+type SwitchAccount struct{}
+
+func init() {
+	register(SwitchAccount{})
+}
+
+func (SwitchAccount) Aliases() []string {
+	return []string{"switch-account"}
+}
+
+func (SwitchAccount) Complete(aerc *widgets.Aerc, args []string) []string {
+	return aerc.AccountNames()
+}
+
+func (SwitchAccount) Execute(aerc *widgets.Aerc, args []string) error {
+	if len(args) != 2 {
+		name := ""
+		if acct := aerc.SelectedAccount(); acct != nil {
+			name = fmt.Sprintf("Current account: %s. ", acct.Name())
+		}
+		return errors.New(name + "Usage: switch-account <account-name>")
+	}
+
+	switcher, ok := aerc.SelectedTabContent().(AccountSwitcher)
+	if !ok {
+		return errors.New("this tab cannot switch accounts")
+	}
+
+	if acct, err := aerc.Account(args[1]); err != nil {
+		return err
+	} else {
+		return switcher.SwitchAccount(acct)
+	}
+}
diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd
index 40b14d8..f0ca97e 100644
--- a/doc/aerc.1.scd
+++ b/doc/aerc.1.scd
@@ -476,6 +476,10 @@ message list, the message in the message viewer, etc).
 	configuration. For details on configuring outgoing mail delivery consult
 	*aerc-config*(5).
 
+*switch-account* <account-name>
+	Switches the account. If run without arguments, the current account name
+	is displayed.
+
 *header* [-f] <field> [value]
 	Add a new email header. If the header already exists, -f must be
 	specified to replace the given value.