loader and mailer tweaks