fixed few bugs.
Merge branch 'email' into staging
Merge branch 'staging' of https://github.com/scrollback/scrollback into staging