Fixing BR #39 (splitting long messages)