Fix for Multi-Part Messages  Part2