Fixed up the Pop3 code a bit.