Fix for Multi-Part Messages

Still have one more issue to test out...