[FIX] website_mail: backport of master fix a54caabbcb10a7db02f872ef5097ac379db5445f