finishing up the loading mailer
resolved merge conflict