fixes to mime-encoded data concat & qp undescore handling