Fix Bug 977659, improve notifications message lib

@peterbe r?