The replacement buffer was not cleared when reset with a new
subject. Fixed by actually clearing it.

Change-Id: Icc24d2d9727d8f540e2e40449f6ea46ce2a07d6b