Fixed messagepart ordering bug