Adding small fixes and GMail specific features