Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1