Fixed the mail retrieval code I broke earlier