Merge branch 'lt/mailinfo-in-body-header-continuation'