email and threader are now optional modules
Merge branch 'master' of https://github.com/scrollback/scrollback