r20136: Fix #4290. Properly compute time to password expiration in message from