fix email display logic
fix merge conflicts