Both. But this highly debated topic was somewhat put to rest recently when the AP Style Guide officially announced it was dropping the hyphen from “e-mail”. And atlas, the world rejoiced. I never appreciated the hyphen in e-mail, so now we can write it (and not be accosted by our editors) without the hyphen.
Read all the other updates to the style guide here:
