tweak gmail2mutt again
updates from upstream