Some more Modules - Mailalert improvements