Really the whole API needs to be gone over to restore the
separation of concerns; but that's what email6 is about.