Remove orderby to workaround PG issue
Merge branch 'master' of git://github.com/flavour/eden
msg.compose label fixes
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc
Merge branch 'master' of git://github.com/flavour/ifrc_qa