Minor correction to comments email subject. Added metadata for title
and website in email. Re-applied exact code from upstream for comments
and feed blocks in attempt to track down ID problem.