Misc. messaging improvements