reaname mailboxes
minor bugfixes
sort
Merge branch 'master' of https://github.com/javiergarmon/inbox