Merge branch 'jc/mailinfo-remove-brackets'