Major changes to parsing

Unsure what has happened, but the script no longer managed to find
the message body anymore, these changes allow it to function again.

NOTE: This will leave you with a link to any signature images, I
can't find a nice way to avoid this