Slightly better message management