Merged commit 2cba3ad801117cc2a1e4ea6f135cc9a7c642962b from branch "store special use folders"

Conflicts:
	lib/account.php
	lib/mailbox.php

Conflicts:
	lib/account.php
	lib/mailbox.php