fixes on x-email
merged
fixed x-email