Added the rootFolder nodes to the tree builer
Merge branch 'master' of http://github.com/bagedevimo/email