Merge branch 'jt/mailinfo-fold-in-body-headers'