Fixes for incoming message notifications