Include requested messages when getting next send time
This branch fixes a copypasta bug in !695 (merged). The backport (!703 (merged)) already has the fix.
This branch fixes a copypasta bug in !695 (merged). The backport (!703 (merged)) already has the fix.