I don't want to complexity this PR too much so I didn't change that `<p>`. I'll file a new bug for that, as @cvan said the `nl2br` also is problematic for `<ul>` or `<ol>` inside that HTML.