Continued work on GetMail(); minor code changes.