Merge branch 'jc/maint-fix-mailinfo-strip' into maint

* jc/maint-fix-mailinfo-strip: mailinfo: do not strip leading spaces even for a header line