Some more email changes

This inlcudes the query post change