Enhance messaging even more. Thanks to Alex/Laurea, now ~40% less messages