diff --git a/internal/cli/admin_test.go b/internal/cli/admin_test.go
index c93e077..415751e 100644
--- a/internal/cli/admin_test.go
+++ b/internal/cli/admin_test.go
@@ -132,7 +132,7 @@ func TestAuditListCoreRenders(t *testing.T) {
 	}
 }
 
-func TestAccountEditFromValidationRejectsMailformed(t *testing.T) {
+func TestAccountEditFromValidationRejectsMalformed(t *testing.T) {
 	adminEnv(t)
 	// Seed an account so the failure is from --from validation, not a missing account.
 	run(t, "account", "add", "--name", "valacc", "--imap-host", "imap.x.com", "--username", "u@x.com")
diff --git a/internal/mail/send_test.go b/internal/mail/send_test.go
index 8d686a9..ec6cf0b 100644
--- a/internal/mail/send_test.go
+++ b/internal/mail/send_test.go
@@ -109,7 +109,7 @@ func TestEnvelopeFromStripsDisplayName(t *testing.T) {
 	}
 	for in, want := range cases {
 		if got := envelopeFrom(in); got != want {
-			t.Fatalf("envelopeFrom(%q) = %q, want %q", in, got, want)
+			t.Errorf("envelopeFrom(%q) = %q, want %q", in, got, want)
 		}
 	}
 }
diff --git a/internal/tui/account.go b/internal/tui/account.go
index e4d9ae0..f25b33c 100644
--- a/internal/tui/account.go
+++ b/internal/tui/account.go
@@ -36,7 +36,7 @@ func ValidFromAddress(s string) error {
 		return nil
 	}
 	if _, err := mail.ParseAddress(s); err != nil {
-		return errors.New("from address must be a valid email address")
+		return errors.New("from address must be a valid email address or \"Name <email>\"")
 	}
 	return nil
 }