Added email comment fields