Fix incorrect handling of HTML comments in messages sanitization code (#1489904)
Fix so current page is reset on list-mode change (#1489907)

Conflicts:

	program/steps/mail/func.inc