[v1-train] Email scroll and wait patch

This is a patch to match the existing code in v1.0.1 , the commit I couldn't uplift.

The original v1.0.1 pull for this is #906.

Branches:
`v1.0.1` -> Do not merge
`v1-train` -> Merge
`desktop` -> Untested