fix incoming message force close

-add back removed code for notification