Fix broken Replies Only feature

Note that this is only a partial fix (see comments on L775).
However, this fix will work with all existing and future Replies Only subscriptions.