Add mailwatch basic upgrade