More work on mail demo