Merge branch 'js/mailinfo'