fix(notifications): Better threading + resolve html entities decoding issue

* [ ] Make Travis happy
* [ ] LGTM from 3 Elgg owners (@Srokap, @ewinslow, THREE)

Fixes #6894
The nested extract is confusing to read