Merge branch 'ef/mailinfo-short-name'