misc edits for func_mailwatch