Fix for resuming messages of different meta-types
Fixup
Merge pull request #305 from NielsZeilemaker/fix_delay

Fix delay messages