brute force sort of messages in a folder
Merge branch 'master' into fixing-16-master

Conflicts:
	lib/mailbox.php
Merge pull request #31 from owncloud/fixing-16-master

brute force sort of messages in a folder