correcting OrderMail bugs