Fixing OF Multipart messages