Changed multipart email extraction to be more flexible
Basic functionality working :)