MSINM-45: More work on reporting pages and mail