Improved max message size logic and added test for it

---------

Co-authored-by: Francisco Aguirre <[email protected]>
Co-authored-by: command-bot <>