Better message parts parsing