changed default email timeouts
Merge branch 'dev/temp' of https://github.com/scrollback/scrollback into dev/temp