Merge branch 'jc/maint-mailinfo-mime-attr'