How to remove old identities from Mail?
Apparently removing the file
~/Saved Application State/com.apple.mail.savedState
resolved Daniel's problem without resorting to a factory reset.
Mac OS X is great for saving your progress but once in a while that savedState file causes these types of problems.
Happy Day!