2243249, 2295695 - Fix URL for comments & broken HTML in email view

See https://www.drupal.org/node/2243249