Merge branch 'jk/mailinfo-cleanup'