A few more edits in func_mailwatch