Remove splitting message from message handler

Now just handling it earlier
Fix splitting long messages on spaces

Add tests