Add handling for non-multipart emails

Added the ability to handle single piece emails.
Simplified slightly.