Fix subject + heading Closes #3841

@coenjacobs .15 please