Small modifications from upstream merged
Merge branch 'master' of https://github.com/wckd/imbox

Conflicts:
	imbox/__init__.py
	imbox/imap_utf7.py