Fix mail.google.com problem
fixed conflicts