Rework checks for Message-id in Hfilter