Grab emails fix