various email collection and element related fixes