Expire cached mailbox lists when switching to/from virtual trash
Merge branch 'master' into imp_6_1

Conflicts:
	imp/lib/Prefs/Special/Trash.php