French trash support
Merge branch 'master' of github.com:pricematch/gmail

Conflicts:
	lib/gmail/message.rb