Implemented some more TNEF logic...