Bug/3662 signal unread when flag changes

This includes the previous commit too, but the merge will be clean (so no need to rebase).