Better notifications (preview of the real message)
Remove notification hack introduced by last commit