Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse v0.19.3

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py

index 2eb325c7c7..c7afd11111 100644
--- a/synapse/push/emailpusher.py
+++ b/synapse/push/emailpusher.py
@@ -218,7 +218,8 @@ class EmailPusher(object):
         )
 
     def seconds_until(self, ts_msec):
-        return (ts_msec - self.clock.time_msec()) / 1000
+        secs = (ts_msec - self.clock.time_msec()) / 1000
+        return max(secs, 0)
 
     def get_room_throttle_ms(self, room_id):
         if room_id in self.throttle_params: