internal messaging tweaks