Updated according to last Gmail UI changes