move exsting task and mailer into this extension