Many thanks to @rianquinn. This should fix #495, #494 and #529.
The note is not visible to the blocked user.