Fixes for gift email