Watchlist notice: Proper deadline calculation