Add todo's for MailWatch