fixing the missing reply-context stuff