Rework message splitting to properly handle encrypted messages