Email queue adding and other updates