Merge branch 'js/mailinfo-format-flowed-fix' into maint