Code

Merge branch 'ks/maint-mailinfo-folded'