Decode email bodies correctly. Added new test case for this