Code

Merge branch 'jc/mailinfo'