better email queue, fix for email class name in deliver method