0d3bbf1 Improve subscription messaging